X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b14abf14c7b6a29e907035ff24a86d45be762752..5e08131542dd06b284465d5325b9479b960d080e:/samples/stc/makefile.wat

diff --git a/samples/stc/makefile.wat b/samples/stc/makefile.wat
index a67fb9188a..96db58ba51 100644
--- a/samples/stc/makefile.wat
+++ b/samples/stc/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.6 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -110,26 +110,33 @@ __OPTIMIZEFLAG_2 = -od
 !ifeq BUILD release
 __OPTIMIZEFLAG_2 = -ot -ox
 !endif
-__RUNTIME_LIBS_5 =
+__THREADSFLAG_5 =
+!ifeq USE_THREADS 0
+__THREADSFLAG_5 = 
+!endif
+!ifeq USE_THREADS 1
+__THREADSFLAG_5 = -bm
+!endif
+__RUNTIME_LIBS_6 =
 !ifeq RUNTIME_LIBS dynamic
-__RUNTIME_LIBS_5 = -br
+__RUNTIME_LIBS_6 = -br
 !endif
 !ifeq RUNTIME_LIBS static
-__RUNTIME_LIBS_5 = 
+__RUNTIME_LIBS_6 = 
 !endif
-__EXCEPTIONSFLAG_6 =
-!ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_6 = 
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
 !endif
-!ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_6 = -xr
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr
 !endif
-__EXCEPTIONSFLAG_7 =
+__EXCEPTIONSFLAG_8 =
 !ifeq USE_EXCEPTIONS 0
-__EXCEPTIONSFLAG_7 = 
+__EXCEPTIONSFLAG_8 = 
 !endif
 !ifeq USE_EXCEPTIONS 1
-__EXCEPTIONSFLAG_7 = -xs
+__EXCEPTIONSFLAG_8 = -xs
 !endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
@@ -171,6 +178,18 @@ __DEBUG_DEFINE_p = -d__WXDEBUG__
 !ifeq DEBUG_FLAG 1
 __DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif
+__EXCEPTIONS_DEFINE_p =
+!ifeq USE_EXCEPTIONS 0
+__EXCEPTIONS_DEFINE_p = -dwxNO_EXCEPTIONS
+!endif
+__RTTI_DEFINE_p =
+!ifeq USE_RTTI 0
+__RTTI_DEFINE_p = -dwxNO_RTTI
+!endif
+__THREAD_DEFINE_p =
+!ifeq USE_THREADS 0
+__THREAD_DEFINE_p = -dwxNO_THREADS
+!endif
 __UNICODE_DEFINE_p =
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
@@ -182,17 +201,19 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 27
 OBJS = &
 	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = &
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
-STCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) &
-	-d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
-	-i=.\..\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 &
-	-i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH -i=.\..\..\include &
-	$(__EXCEPTIONSFLAG_6) $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) $(CXXFLAGS)
+STCTEST_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) $(__THREADSFLAG_5) &
+	$(__RUNTIME_LIBS_6) -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) &
+	$(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) &
+	$(__UNICODE_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\..\include -wx -wcd=549 &
+	-wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples -dNOPCH &
+	-i=.\..\..\include $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+	$(CXXFLAGS)
 STCTEST_OBJECTS =  &
 	$(OBJS)\stctest_stctest.obj &
 	$(OBJS)\stctest_edit.obj &
@@ -224,6 +245,7 @@ $(OBJS)\stctest.exe :  $(STCTEST_OBJECTS) $(OBJS)\stctest_sample.res
 	@for %i in ($(STCTEST_OBJECTS)) do @%append $(OBJS)\stctest.lbc file %i
 	@for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_stc.lib  $(__WXLIB_CORE_p)  $(__WXLIB_BASE_p)  $(__WXLIB_MONO_p) $(__LIB_TIFF_p) $(__LIB_JPEG_p) $(__LIB_PNG_p) wxzlib$(WXDEBUGFLAG).lib  wxregex$(WXUNICODEFLAG)$(WXDEBUGFLAG).lib wxexpat$(WXDEBUGFLAG).lib $(EXTRALIBS_FOR_BASE)  kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib comctl32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib odbc32.lib ) do @%append $(OBJS)\stctest.lbc library %i
 	@%append $(OBJS)\stctest.lbc option resource=$(OBJS)\stctest_sample.res
+	@for %i in () do @%append $(OBJS)\stctest.lbc option stack=%i
 	wlink @$(OBJS)\stctest.lbc
 
 data : .SYMBOLIC 
@@ -231,14 +253,14 @@ data : .SYMBOLIC
 	for %f in (stctest.cpp) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\stctest_sample.res :  .AUTODEPEND .\..\..\..\samples\sample.rc
-	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) -i=.\..\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $<
+	wrc -q -ad -bt=nt -r -fo=$^@   -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__EXCEPTIONS_DEFINE_p) $(__RTTI_DEFINE_p) $(__THREAD_DEFINE_p) $(__UNICODE_DEFINE_p)  -i=$(SETUPHDIR) -i=.\..\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\..\samples $<
 
 $(OBJS)\stctest_stctest.obj :  .AUTODEPEND .\stctest.cpp
-	$(CXX) -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
 
 $(OBJS)\stctest_edit.obj :  .AUTODEPEND .\edit.cpp
-	$(CXX) -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
 
 $(OBJS)\stctest_prefs.obj :  .AUTODEPEND .\prefs.cpp
-	$(CXX) -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(STCTEST_CXXFLAGS) $<