Fix wxHash{Set,Map} compilation with g++ 4.7 in C++11 mode.

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

diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc
index 1ddcd8c3cf7f564694e9765bb636cf5fc080d89c..43f547e54fa6b4796e837d0f70c1f18226d40568 100644 (file)
--- a/samples/stc/makefile.gcc
+++ b/samples/stc/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,10 +29,10 @@ STCTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 STCTEST_OBJECTS =  \\r
        -I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \\r
        -Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)\r
 STCTEST_OBJECTS =  \\r

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

        $(OBJS)\stctest_stctest.o \\r
        $(OBJS)\stctest_edit.o \\r
        $(OBJS)\stctest_stctest.o \\r
        $(OBJS)\stctest_edit.o \\r

-       $(OBJS)\stctest_prefs.o \\r
-       $(OBJS)\stctest_sample_rc.o\r
+       $(OBJS)\stctest_prefs.o\r

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


@@ -67,7 +67,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


@@ -231,6 +231,9 @@ data:
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (stctest.cpp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r
        if not exist $(OBJS) mkdir $(OBJS)\r
        for %%f in (stctest.cpp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)\r
 \r

+$(OBJS)\stctest_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)\stctest_stctest.o: ./stctest.cpp\r
        $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\stctest_stctest.o: ./stctest.cpp\r
        $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r


@@ -240,9 +243,6 @@ $(OBJS)\stctest_edit.o: ./edit.cpp
 $(OBJS)\stctest_prefs.o: ./prefs.cpp\r
        $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r
 $(OBJS)\stctest_prefs.o: ./prefs.cpp\r
        $(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<\r
 \r

-$(OBJS)\stctest_sample_rc.o: ./../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

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