X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8c9f8f91cd62335261ee29762747218f28d129de..fa2b309e782464cffe7163d03a740a32fa385af5:/demos/forty/makefile.wat?ds=sidebyside

diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat
index 69484cc96b..e0649b21be 100644
--- a/demos/forty/makefile.wat
+++ b/demos/forty/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -148,6 +148,11 @@ __WXLIB_ADV_p =
 __WXLIB_ADV_p = &
 	wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 !endif
+__WXLIB_XML_p =
+!ifeq MONOLITHIC 0
+__WXLIB_XML_p = &
+	wxbase$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_xml.lib
+!endif
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &
@@ -175,6 +180,10 @@ __LIB_PNG_p =
 !ifeq USE_GUI 1
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
+!endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 __WXUNIV_DEFINE_p = -d__WXUNIVERSAL__
@@ -201,9 +210,16 @@ __THREAD_DEFINE_p =
 __THREAD_DEFINE_p = -dwxNO_THREADS
 !endif
 __UNICODE_DEFINE_p =
+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif
 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !endif
+__GFXCTX_DEFINE_p =
+!ifeq USE_GDIPLUS 1
+__GFXCTX_DEFINE_p = -dwxUSE_GRAPHICS_CONTEXT=1
+!endif
 __DLLFLAG_p =
 !ifeq SHARED 1
 __DLLFLAG_p = -dWXUSINGDLL
@@ -211,18 +227,20 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat
 OBJS = &
-	wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
-LIBDIRNAME = .\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
+	$(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)
 SETUPHDIR = &
 	$(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 FORTY_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=.\..\..\include -i=$(SETUPHDIR) -wx -wcd=549 &
-	-wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH &
-	$(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) $(CXXFLAGS)
+	$(__UNICODE_DEFINE_p) $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) &
+	-i=.\..\..\include -wx -wcd=549 -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) &
+	-i=.\..\..\samples -dNOPCH $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) $(CPPFLAGS) &
+	$(CXXFLAGS)
 FORTY_OBJECTS =  &
 	$(OBJS)\forty_forty.obj &
 	$(OBJS)\forty_canvas.obj &
@@ -257,8 +275,9 @@ $(OBJS)\forty.exe :  $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
 	@%append $(OBJS)\forty.lbc option caseexact
 	@%append $(OBJS)\forty.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
 	@for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i
-	@for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__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)\forty.lbc library %i
+	@for %i in ( $(__WXLIB_HTML_p)  $(__WXLIB_ADV_p)  $(__WXLIB_XML_p)  $(__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)  $(__GDIPLUS_LIB_p) 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) do @%append $(OBJS)\forty.lbc library %i
 	@%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res
+	@for %i in () do @%append $(OBJS)\forty.lbc option stack=%i
 	wlink @$(OBJS)\forty.lbc
 
 data : .SYMBOLIC 
@@ -266,29 +285,29 @@ data : .SYMBOLIC
 	for %f in (about.htm) do if not exist $(OBJS)\%f copy .\%f $(OBJS)
 
 $(OBJS)\forty_forty.obj :  .AUTODEPEND .\forty.cpp
-	$(CXX) -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
 
 $(OBJS)\forty_canvas.obj :  .AUTODEPEND .\canvas.cpp
-	$(CXX) -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
 
 $(OBJS)\forty_card.obj :  .AUTODEPEND .\card.cpp
-	$(CXX) -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
 
 $(OBJS)\forty_game.obj :  .AUTODEPEND .\game.cpp
-	$(CXX) -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
 
 $(OBJS)\forty_pile.obj :  .AUTODEPEND .\pile.cpp
-	$(CXX) -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
 
 $(OBJS)\forty_playerdg.obj :  .AUTODEPEND .\playerdg.cpp
-	$(CXX) -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
 
 $(OBJS)\forty_scoredg.obj :  .AUTODEPEND .\scoredg.cpp
-	$(CXX) -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
 
 $(OBJS)\forty_scorefil.obj :  .AUTODEPEND .\scorefil.cpp
-	$(CXX) -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
+	$(CXX) -bt=nt -zq -fo=$^@ $(FORTY_CXXFLAGS) $<
 
 $(OBJS)\forty_forty.res :  .AUTODEPEND .\forty.rc
-	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=.\..\..\include -i=$(SETUPHDIR) -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<
+	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)  $(__GFXCTX_DEFINE_p) -i=$(SETUPHDIR) -i=.\..\..\include -i=. $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $<