Added note about WXWIN_COMPATIBILITY_2_6 being off in 2.9 by default.

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

diff --git a/samples/dialogs/makefile.gcc b/samples/dialogs/makefile.gcc
index 8a8a78525ecb3092505180de50c9139fe1b04d18..d79d50a84f1afd7a1dbd5a9793272c507562dcd9 100644 (file)
--- a/samples/dialogs/makefile.gcc
+++ b/samples/dialogs/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


@@ -29,9 +29,9 @@ DIALOGS_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 DIALOGS_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 DIALOGS_OBJECTS =  \\r

+       $(OBJS)\dialogs_sample_rc.o \\r

        $(OBJS)\dialogs_dialogs.o \\r
        $(OBJS)\dialogs_dialogs.o \\r

-       $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS) \\r
-       $(OBJS)\dialogs_dialogs_rc.o\r
+       $(____GENERIC_DIALOGS_IN_NATIVE_BUILDS_FILENAMES_OBJECTS)\r

 \r
 ### Conditionally set variables: ###\r
 \r
 \r
 ### Conditionally set variables: ###\r
 \r


@@ -66,7 +66,7 @@ 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
+EXTRALIBS_FOR_BASE =   \r

 endif\r
 ifeq ($(BUILD),debug)\r
 __OPTIMIZEFLAG_2 = -O0\r
 endif\r
 ifeq ($(BUILD),debug)\r
 __OPTIMIZEFLAG_2 = -O0\r


@@ -232,13 +232,16 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\dialogs.exe del $(OBJS)\dialogs.exe\r
 \r

-$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_dialogs_rc.o\r
+$(OBJS)\dialogs.exe: $(DIALOGS_OBJECTS) $(OBJS)\dialogs_sample_rc.o\r

        $(CXX) -o $@ $(DIALOGS_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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (tips.txt) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
        $(CXX) -o $@ $(DIALOGS_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\r
 \r
 data: \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (tips.txt) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r

+$(OBJS)\dialogs_sample_rc.o: ./../../samples/sample.rc\r
+       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\r
+\r

 $(OBJS)\dialogs_dialogs.o: ./dialogs.cpp\r
        $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\dialogs_dialogs.o: ./dialogs.cpp\r
        $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
 \r


@@ -254,9 +257,6 @@ $(OBJS)\dialogs_filedlgg.o: ./../../src/generic/filedlgg.cpp
 $(OBJS)\dialogs_fontdlgg.o: ./../../src/generic/fontdlgg.cpp\r
        $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\dialogs_fontdlgg.o: ./../../src/generic/fontdlgg.cpp\r
        $(CXX) -c -o $@ $(DIALOGS_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\dialogs_dialogs_rc.o: ./dialogs.rc\r
-       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\r
-\r

 .PHONY: all clean data\r
 \r
 \r
 .PHONY: all clean data\r
 \r
 \r