X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cb332c1553bb977cb8db16c19c733684ef72805..89b3361ec25cf1e6d255b14c7633d8375646e4fb:/samples/stc/makefile.gcc

diff --git a/samples/stc/makefile.gcc b/samples/stc/makefile.gcc
index 244a6f3f41..e81dd43047 100644
--- a/samples/stc/makefile.gcc
+++ b/samples/stc/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.2.8 (http://www.bakefile.org)
+#     Bakefile 0.2.9 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -16,8 +16,9 @@ CPPDEPS = -MT$@ -MF$@.d -MD -MP
 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)
 STCTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
@@ -29,10 +30,10 @@ STCTEST_CXXFLAGS = $(__DEBUGINFO) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG) \
 	-I.\..\..\samples -DNOPCH $(__RTTIFLAG_5) $(__EXCEPTIONSFLAG_6) \
 	-Wno-ctor-dtor-privacy $(CPPFLAGS) $(CXXFLAGS)
 STCTEST_OBJECTS =  \
-	$(OBJS)\stctest_sample_rc.o \
+	$(OBJS)\stctest_sample_rc.o \
 	$(OBJS)\stctest_stctest.o \
 	$(OBJS)\stctest_edit.o \
-	$(OBJS)\stctest_prefs.o
+	$(OBJS)\stctest_prefs.o
 
 ### Conditionally set variables: ###
 
@@ -45,6 +46,9 @@ endif
 ifeq ($(USE_GUI),1)
 PORTNAME = msw
 endif
+ifeq ($(OFFICIAL_BUILD),1)
+COMPILER_VERSION = ERROR-COMPILER-VERSION-MUST-BE-SET-FOR-OFFICIAL-BUILD
+endif
 ifeq ($(BUILD),debug)
 WXDEBUGFLAG = d
 endif
@@ -67,7 +71,7 @@ ifeq ($(MONOLITHIC),0)
 EXTRALIBS_FOR_BASE = 
 endif
 ifeq ($(MONOLITHIC),1)
-EXTRALIBS_FOR_BASE =  
+EXTRALIBS_FOR_BASE =   
 endif
 ifeq ($(BUILD),debug)
 __OPTIMIZEFLAG_2 = -O0
@@ -231,9 +235,9 @@ data:
 	if not exist $(OBJS) mkdir $(OBJS)
 	for %%f in (stctest.cpp) do if not exist $(OBJS)\%%f copy .\%%f $(OBJS)
 
-$(OBJS)\stctest_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
-
+$(OBJS)\stctest_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
+
 $(OBJS)\stctest_stctest.o: ./stctest.cpp
 	$(CXX) -c -o $@ $(STCTEST_CXXFLAGS) $(CPPDEPS) $<