Fix wrong configure test for abi::__forced_unwind in previous commit.

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

diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc
index 1ddcd8c3cf7f564694e9765bb636cf5fc080d89c..e81dd43047b324b532cef4505052e5cdb9784016 100644 (file)
--- a/samples/stc/makefile.gcc
+++ b/samples/stc/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================\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
@@ -16,8 +16,9 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
 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
 STCTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \\r
@@ -29,10 +30,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
+       $(OBJS)\stctest_sample_rc.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
@@ -45,6 +46,9 @@ endif
 ifeq ($(USE_GUI),1)\r
 PORTNAME = msw\r
 endif\r
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
 ifeq ($(BUILD),debug)\r
 WXDEBUGFLAG = d\r
 endif\r
@@ -67,7 +71,7 @@ ifeq ($(MONOLITHIC),0)
 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
@@ -231,6 +235,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
+$(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
@@ -240,9 +247,6 @@ $(OBJS)\stctest_edit.o: ./edit.cpp
 $(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