Add wxPreferencesEditor class.

[wxWidgets.git] / samples / treelist / makefile.gcc

diff --git a/samples/treelist/makefile.gcc b/samples/treelist/makefile.gcc
index c930d9827dd003fcdfa3fa70d4012452ca92daf5..63b9554edf16de48f2bfb9f2063943dc3700db98 100644 (file)
--- a/samples/treelist/makefile.gcc
+++ b/samples/treelist/makefile.gcc
@@ -16,24 +16,31 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
 WX_RELEASE_NODOT = 29
 COMPILER_PREFIX = gcc
 OBJS = \
 WX_RELEASE_NODOT = 29
 COMPILER_PREFIX = gcc
 OBJS = \

-       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
+       $(COMPILER_PREFIX)$(COMPILER_VERSION)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = \
+       .\..\..\lib\$(COMPILER_PREFIX)$(COMPILER_VERSION)_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 TREELIST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
 SETUPHDIR = \
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 TREELIST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \

-       $(GCCFLAGS) -DHAVE_W32API_H -D__WXMSW__ $(__WXUNIV_DEFINE_p) \
+       $(GCCFLAGS) -DHAVE_W32API_H -D__WX$(TOOLKIT)__ $(__WXUNIV_DEFINE_p) \

        $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
        $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
        $(__DEBUG_DEFINE_p) $(__NDEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) \
        $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p) \
        $(__MSLU_DEFINE_p) -I$(SETUPHDIR) -I.\..\..\include \
        $(____CAIRO_INCLUDEDIR_FILENAMES_p) -W -Wall -I. $(__DLLFLAG_p) \
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \

-       -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
+       -Wno-ctor-dtor-privacy $(CXXFLAGS_GTK_WINDOWS_GCC) $(CPPFLAGS) $(CXXFLAGS)

 TREELIST_OBJECTS =  \
        $(OBJS)\treelist_sample_rc.o \
        $(OBJS)\treelist_treelist.o
 
 ### Conditionally set variables: ###
 
 TREELIST_OBJECTS =  \
        $(OBJS)\treelist_sample_rc.o \
        $(OBJS)\treelist_treelist.o
 
 ### Conditionally set variables: ###
 

+ifeq ($(TOOLKIT),GTK)
+WIN32_TOOLKIT_LOWERCASE = gtk
+endif
+ifeq ($(TOOLKIT),MSW)
+WIN32_TOOLKIT_LOWERCASE = msw
+endif

 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif
 ifeq ($(GCC_VERSION),2.95)
 GCCFLAGS = -fvtable-thunks
 endif


@@ -41,7 +48,13 @@ ifeq ($(USE_GUI),0)
 PORTNAME = base
 endif
 ifeq ($(USE_GUI),1)
 PORTNAME = base
 endif
 ifeq ($(USE_GUI),1)

-PORTNAME = msw
+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
 ifeq ($(BUILD),debug)
 WXDEBUGFLAG = d
 endif
 ifeq ($(BUILD),debug)
 WXDEBUGFLAG = d


@@ -62,10 +75,20 @@ ifeq ($(SHARED),1)
 LIBTYPE_SUFFIX = dll
 endif
 ifeq ($(MONOLITHIC),0)
 LIBTYPE_SUFFIX = dll
 endif
 ifeq ($(MONOLITHIC),0)

-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE = 

 endif
 ifeq ($(MONOLITHIC),1)
 endif
 ifeq ($(MONOLITHIC),1)

-EXTRALIBS_FOR_BASE =
+EXTRALIBS_FOR_BASE =   
+endif
+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)
 __OPTIMIZEFLAG_2 = -O0
 endif
 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG_2 = -O0


@@ -77,13 +100,13 @@ ifeq ($(USE_RTTI),0)
 __RTTIFLAG_5 = -fno-rtti
 endif
 ifeq ($(USE_RTTI),1)
 __RTTIFLAG_5 = -fno-rtti
 endif
 ifeq ($(USE_RTTI),1)

-__RTTIFLAG_5 =
+__RTTIFLAG_5 = 

 endif
 ifeq ($(USE_EXCEPTIONS),0)
 __EXCEPTIONSFLAG_6 = -fno-exceptions
 endif
 ifeq ($(USE_EXCEPTIONS),1)
 endif
 ifeq ($(USE_EXCEPTIONS),0)
 __EXCEPTIONSFLAG_6 = -fno-exceptions
 endif
 ifeq ($(USE_EXCEPTIONS),1)

-__EXCEPTIONSFLAG_6 =
+__EXCEPTIONSFLAG_6 = 

 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__
 endif
 ifeq ($(WXUNIV),1)
 __WXUNIV_DEFINE_p = -D__WXUNIVERSAL__


@@ -161,7 +184,7 @@ __WXLIB_CORE_p = \
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = \
 endif
 ifeq ($(MONOLITHIC),0)
 __WXLIB_BASE_p = \

-       -lwxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)
+       -lwxbase$(WXBASEPORT)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)

 endif
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \
 endif
 ifeq ($(MONOLITHIC),1)
 __WXLIB_MONO_p = \


@@ -192,17 +215,17 @@ endif
 endif
 ifeq ($(BUILD),release)
 ifeq ($(DEBUG_INFO),default)
 endif
 ifeq ($(BUILD),release)
 ifeq ($(DEBUG_INFO),default)

-__DEBUGINFO =
+__DEBUGINFO = 

 endif
 endif
 ifeq ($(DEBUG_INFO),0)
 endif
 endif
 ifeq ($(DEBUG_INFO),0)

-__DEBUGINFO =
+__DEBUGINFO = 

 endif
 ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
 endif
 ifeq ($(USE_THREADS),0)
 endif
 ifeq ($(DEBUG_INFO),1)
 __DEBUGINFO = -g
 endif
 ifeq ($(USE_THREADS),0)

-__THREADSFLAG =
+__THREADSFLAG = 

 endif
 ifeq ($(USE_THREADS),1)
 __THREADSFLAG = -mthreads
 endif
 ifeq ($(USE_THREADS),1)
 __THREADSFLAG = -mthreads


@@ -217,16 +240,16 @@ $(OBJS):
 
 all: $(OBJS)\treelist.exe
 
 
 all: $(OBJS)\treelist.exe
 

-clean:
+clean: 

        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\*.d del $(OBJS)\*.d
        -if exist $(OBJS)\treelist.exe del $(OBJS)\treelist.exe
 
 $(OBJS)\treelist.exe: $(TREELIST_OBJECTS) $(OBJS)\treelist_sample_rc.o
        -if exist $(OBJS)\*.o del $(OBJS)\*.o
        -if exist $(OBJS)\*.d del $(OBJS)\*.d
        -if exist $(OBJS)\treelist.exe del $(OBJS)\treelist.exe
 
 $(OBJS)\treelist.exe: $(TREELIST_OBJECTS) $(OBJS)\treelist_sample_rc.o

-       $(CXX) -o $@ $(TREELIST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet
+       $(CXX) -o $@ $(TREELIST_OBJECTS)  $(__DEBUGINFO) $(__THREADSFLAG) -L$(LIBDIRNAME) -Wl,--subsystem,windows -mwindows $(____CAIRO_LIBDIR_FILENAMES_p) $(LDFLAGS)  $(__WXLIB_ADV_p)  $(__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

 
 $(OBJS)\treelist_sample_rc.o: ./../../samples/sample.rc
 
 $(OBJS)\treelist_sample_rc.o: ./../../samples/sample.rc

-       windres --use-temp-file -i$< -o$@    --define __WXMSW__ $(__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
+       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

 
 $(OBJS)\treelist_treelist.o: ./treelist.cpp
        $(CXX) -c -o $@ $(TREELIST_CXXFLAGS) $(CPPDEPS) $<
 
 $(OBJS)\treelist_treelist.o: ./treelist.cpp
        $(CXX) -c -o $@ $(TREELIST_CXXFLAGS) $(CPPDEPS) $<