Fixed problems caused by duplicated names across different style types.

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

diff --git a/samples/artprov/makefile.gcc b/samples/artprov/makefile.gcc
index f5b444413ec139c187778c8ee295e5d5a1f314a2..8387552dd479018d3332a7115692984de1cab59e 100644 (file)
--- a/samples/artprov/makefile.gcc
+++ b/samples/artprov/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 @@ ARTTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ARTTEST_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 ARTTEST_OBJECTS =  \\r

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

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

-       $(OBJS)\arttest_artbrows.o \\r
-       $(OBJS)\arttest_arttest_rc.o\r
+       $(OBJS)\arttest_artbrows.o\r

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


@@ -219,18 +219,18 @@ clean:
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe\r
 \r
        -if exist $(OBJS)\*.d del $(OBJS)\*.d\r
        -if exist $(OBJS)\arttest.exe del $(OBJS)\arttest.exe\r
 \r

-$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_arttest_rc.o\r
+$(OBJS)\arttest.exe: $(ARTTEST_OBJECTS) $(OBJS)\arttest_sample_rc.o\r

        $(CXX) -o $@ $(ARTTEST_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
 \r
        $(CXX) -o $@ $(ARTTEST_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) $(__CAIRO_LIB_p) -lkernel32 -luser32 -lgdi32 -lcomdlg32 -lwinspool -lwinmm -lshell32 -lcomctl32 -lole32 -loleaut32 -luuid -lrpcrt4 -ladvapi32 -lwsock32 -lwininet\r
 \r

+$(OBJS)\arttest_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)\arttest_arttest.o: ./arttest.cpp\r
        $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\arttest_artbrows.o: ./artbrows.cpp\r
        $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\arttest_arttest.o: ./arttest.cpp\r
        $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\arttest_artbrows.o: ./artbrows.cpp\r
        $(CXX) -c -o $@ $(ARTTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\arttest_arttest_rc.o: ./arttest.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\r
 \r
 \r
 .PHONY: all clean\r
 \r
 \r