projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove wxRTTI macro for wxComboBox from Motif port.
[wxWidgets.git]
/
samples
/
mdi
/
makefile.gcc
diff --git
a/samples/mdi/makefile.gcc
b/samples/mdi/makefile.gcc
index fe22968cb5a0d7ca70ed040400deca750ebcb9eb..c245a469d3d94b217c8caf101d0441e1a73b8d53 100644
(file)
--- a/
samples/mdi/makefile.gcc
+++ b/
samples/mdi/makefile.gcc
@@
-1,6
+1,6
@@
# =========================================================================
\r
# This makefile was generated by
\r
# =========================================================================
\r
# This makefile was generated by
\r
-# Bakefile 0.2.
8
(http://www.bakefile.org)
\r
+# Bakefile 0.2.
9
(http://www.bakefile.org)
\r
# Do not modify, all changes will be overwritten!
\r
# =========================================================================
\r
\r
# Do not modify, all changes will be overwritten!
\r
# =========================================================================
\r
\r
@@
-16,24
+16,31
@@
CPPDEPS = -MT$@ -MF$@.d -MD -MP
WX_RELEASE_NODOT = 29
\r
COMPILER_PREFIX = gcc
\r
OBJS = \
\r
WX_RELEASE_NODOT = 29
\r
COMPILER_PREFIX = gcc
\r
OBJS = \
\r
- $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
\r
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
\r
+ $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+ .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)
SETUPHDIR = \
\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
\r
MDI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
\r
SETUPHDIR = \
\r
$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
\r
MDI_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) $(GCCFLAGS) \
\r
- -DHAVE_W32API_H -D__WX
MSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
\r
+ -DHAVE_W32API_H -D__WX
$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) \
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
\r
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
\r
$(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) \
\r
$(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) $(__MSLU_DEFINE_p) \
\r
-
$(__GFXCTX_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include
\
\r
-
$(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p
) \
\r
- -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
\r
- -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
\r
+
-I$(SETUPHDIR) -I.\..\..\include $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W
\
\r
+
-Wall -I. $(__DLLFLAG_p) -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5
) \
\r
+ $(__EXCEPTIONSFLAG_6) -Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) \
+ $(CPPFLAGS) $(CXXFLAGS)
MDI_OBJECTS = \
\r
$(OBJS)\mdi_mdi.o \
\r
$(OBJS)\mdi_mdi_rc.o
\r
\r
### Conditionally set variables: ###
\r
\r
MDI_OBJECTS = \
\r
$(OBJS)\mdi_mdi.o \
\r
$(OBJS)\mdi_mdi_rc.o
\r
\r
### Conditionally set variables: ###
\r
\r
+ifeq ($(TOOLKIT),GTK)
+WIN32_TOOLKIT_LOWERCASE = gtk
+endif
+ifeq ($(TOOLKIT),MSW)
+WIN32_TOOLKIT_LOWERCASE = msw
+endif
ifeq ($(GCC_VERSION),2.95)
\r
GCCFLAGS = -fvtable-thunks
\r
endif
\r
ifeq ($(GCC_VERSION),2.95)
\r
GCCFLAGS = -fvtable-thunks
\r
endif
\r
@@
-41,7
+48,13
@@
ifeq ($(USE_GUI),0)
PORTNAME = base
\r
endif
\r
ifeq ($(USE_GUI),1)
\r
PORTNAME = base
\r
endif
\r
ifeq ($(USE_GUI),1)
\r
-PORTNAME = msw
\r
+PORTNAME = $(WIN32_TOOLKIT_LOWERCASE)$(TOOLKIT_VERSION)
+endif
+ifeq ($(TOOLKIT),MAC)
+WXBASEPORT = _carbon
+endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
endif
\r
ifeq ($(BUILD),debug)
\r
WXDEBUGFLAG = d
\r
endif
\r
ifeq ($(BUILD),debug)
\r
WXDEBUGFLAG = d
\r
@@
-65,8
+78,18
@@
ifeq ($(MONOLITHIC),0)
EXTRALIBS_FOR_BASE =
\r
endif
\r
ifeq ($(MONOLITHIC),1)
\r
EXTRALIBS_FOR_BASE =
\r
endif
\r
ifeq ($(MONOLITHIC),1)
\r
-EXTRALIBS_FOR_BASE =
\r
-endif
\r
+EXTRALIBS_FOR_BASE =
\r
+endif
\r
+ifeq ($(TOOLKIT),GTK)
+CXXFLAGS_GTK_WINDOWS_GCC = -mms-bitfields
+endif
+ifeq ($(TOOLKIT),GTK)
+ifeq ($(TOOLKIT_VERSION),2)
+LIB_GTK = gtk-win32-2.0.lib gdk-win32-2.0.lib pangocairo-1.0.lib \
+ gdk_pixbuf-2.0.lib cairo.lib pango-1.0.lib gobject-2.0.lib gthread-2.0.lib \
+ glib-2.0.lib
+endif
+endif
ifeq ($(BUILD),debug)
\r
__OPTIMIZEFLAG_2 = -O0
\r
endif
\r
ifeq ($(BUILD),debug)
\r
__OPTIMIZEFLAG_2 = -O0
\r
endif
\r
@@
-139,12
+162,6
@@
endif
ifeq ($(MSLU),1)
\r
__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
\r
endif
\r
ifeq ($(MSLU),1)
\r
__MSLU_DEFINE_p_1 = --define wxUSE_UNICODE_MSLU=1
\r
endif
\r
-ifeq ($(USE_GDIPLUS),1)
\r
-__GFXCTX_DEFINE_p = -DwxUSE_GRAPHICS_CONTEXT=1
\r
-endif
\r
-ifeq ($(USE_GDIPLUS),1)
\r
-__GFXCTX_DEFINE_p_1 = --define wxUSE_GRAPHICS_CONTEXT=1
\r
-endif
\r
ifeq ($(USE_CAIRO),1)
\r
____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
\r
endif
\r
ifeq ($(USE_CAIRO),1)
\r
____CAIRO_INCLUDEDIR_FILENAMES_p = -I$(CAIRO_ROOT)\include\cairo
\r
endif
\r
@@
-163,7
+180,7
@@
__WXLIB_CORE_p = \
endif
\r
ifeq ($(MONOLITHIC),0)
\r
__WXLIB_BASE_p = \
\r
endif
\r
ifeq ($(MONOLITHIC),0)
\r
__WXLIB_BASE_p = \
\r
- -lwxbase$(WX
_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
\r
+ -lwxbase$(WX
BASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
endif
\r
ifeq ($(MONOLITHIC),1)
\r
__WXLIB_MONO_p = \
\r
endif
\r
ifeq ($(MONOLITHIC),1)
\r
__WXLIB_MONO_p = \
\r
@@
-181,9
+198,6
@@
endif
ifeq ($(MSLU),1)
\r
__UNICOWS_LIB_p = -lunicows
\r
endif
\r
ifeq ($(MSLU),1)
\r
__UNICOWS_LIB_p = -lunicows
\r
endif
\r
-ifeq ($(USE_GDIPLUS),1)
\r
-__GDIPLUS_LIB_p = -lgdiplus
\r
-endif
\r
ifeq ($(USE_CAIRO),1)
\r
__CAIRO_LIB_p = -lcairo
\r
endif
\r
ifeq ($(USE_CAIRO),1)
\r
__CAIRO_LIB_p = -lcairo
\r
endif
\r
@@
-228,13
+242,13
@@
clean:
-if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe
\r
\r
$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi_rc.o
\r
-if exist $(OBJS)\mdi.exe del $(OBJS)\mdi.exe
\r
\r
$(OBJS)\mdi.exe: $(MDI_OBJECTS) $(OBJS)\mdi_mdi_rc.o
\r
- $(CXX) -o $@ $(MDI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)
-lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__GDIPLUS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
\r
+ $(CXX) -o $@ $(MDI_OBJECTS) $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS) $(__WXLIB_CORE_p) $(__WXLIB_BASE_p) $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p)
$(LIB_GTK) -lwxzlib$(WXDEBUGFLAG) -lwxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG) -lwxexpat$(WXDEBUGFLAG) $(EXTRALIBS_FOR_BASE) $(__UNICOWS_LIB_p) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
\r
$(OBJS)\mdi_mdi.o: ./mdi.cpp
\r
$(CXX) -c -o $@ $(MDI_CXXFLAGS) $(CPPDEPS) $<
\r
\r
$(OBJS)\mdi_mdi_rc.o: ./mdi.rc
\r
\r
$(OBJS)\mdi_mdi.o: ./mdi.cpp
\r
$(CXX) -c -o $@ $(MDI_CXXFLAGS) $(CPPDEPS) $<
\r
\r
$(OBJS)\mdi_mdi_rc.o: ./mdi.rc
\r
- windres --use-temp-file -i$< -o$@ --define __WX
MSW__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) $(__GFXCTX_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
\r
+ windres --use-temp-file -i$< -o$@ --define __WX
$(TOOLKIT)__ $(__WXUNIV_DEFINE_p_1) $(__DEBUG_DEFINE_p_1) $(__NDEBUG_DEFINE_p_1) $(__EXCEPTIONS_DEFINE_p_1) $(__RTTI_DEFINE_p_1) $(__THREAD_DEFINE_p_1) $(__UNICODE_DEFINE_p_1) $(__MSLU_DEFINE_p_1) --include-dir $(SETUPHDIR) --include-dir ./../../include $(__CAIRO_INCLUDEDIR_p) --include-dir . $(__DLLFLAG_p_1) --include-dir ./../../samples --define NOPCH
\r
.PHONY: all clean
\r
\r
\r
.PHONY: all clean
\r
\r