revert r59246; the window parameter was there by purpose (i.e. for consistency with...

[wxWidgets.git] / demos / forty / makefile.wat

diff --git a/demos/forty/makefile.wat b/demos/forty/makefile.wat
index 05735332167acad3c31e6d60201f7af56b6f38f6..8938b00e599a183c8df09b4a59b4a46fab6c9faf 100644 (file)
--- a/demos/forty/makefile.wat
+++ b/demos/forty/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.5 (http://www.bakefile.org)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -55,6 +55,13 @@ WXDLLFLAG =
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif
 !ifeq SHARED 1
 WXDLLFLAG = dll
 !endif

+LIBTYPE_SUFFIX =
+!ifeq SHARED 0
+LIBTYPE_SUFFIX = lib
+!endif
+!ifeq SHARED 1
+LIBTYPE_SUFFIX = dll
+!endif

 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
 EXTRALIBS_FOR_BASE = 
 EXTRALIBS_FOR_BASE =
 !ifeq MONOLITHIC 0
 EXTRALIBS_FOR_BASE = 


@@ -103,19 +110,33 @@ __OPTIMIZEFLAG_2 = -od
 !ifeq BUILD release
 __OPTIMIZEFLAG_2 = -ot -ox
 !endif
 !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
 !ifeq RUNTIME_LIBS dynamic

-__RUNTIME_LIBS_5 = -br
+__RUNTIME_LIBS_6 = -br

 !endif
 !ifeq RUNTIME_LIBS static
 !endif
 !ifeq RUNTIME_LIBS static

-__RUNTIME_LIBS_5 = 
+__RUNTIME_LIBS_6 = 
+!endif
+__RTTIFLAG_7 =
+!ifeq USE_RTTI 0
+__RTTIFLAG_7 = 
+!endif
+!ifeq USE_RTTI 1
+__RTTIFLAG_7 = -xr

 !endif
 !endif

-__EXCEPTIONSFLAG_7 =
+__EXCEPTIONSFLAG_8 =

 !ifeq USE_EXCEPTIONS 0
 !ifeq USE_EXCEPTIONS 0

-__EXCEPTIONSFLAG_7 = 
+__EXCEPTIONSFLAG_8 = 

 !endif
 !ifeq USE_EXCEPTIONS 1
 !endif
 !ifeq USE_EXCEPTIONS 1

-__EXCEPTIONSFLAG_7 = -xs
+__EXCEPTIONSFLAG_8 = -xs

 !endif
 __WXLIB_HTML_p =
 !ifeq MONOLITHIC 0
 !endif
 __WXLIB_HTML_p =
 !ifeq MONOLITHIC 0


@@ -127,6 +148,11 @@ __WXLIB_ADV_p =
 __WXLIB_ADV_p = &
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_adv.lib
 !endif
 __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 = &
 __WXLIB_CORE_p =
 !ifeq MONOLITHIC 0
 __WXLIB_CORE_p = &


@@ -154,12 +180,9 @@ __LIB_PNG_p =
 !ifeq USE_GUI 1
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif
 !ifeq USE_GUI 1
 __LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
 !endif

-LIBDIRNAME =
-!ifeq SHARED 0
-LIBDIRNAME = .\..\..\lib\wat_lib$(CFG)
-!endif
-!ifeq SHARED 1
-LIBDIRNAME = .\..\..\lib\wat_dll$(CFG)
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib

 !endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1
 !endif
 __WXUNIV_DEFINE_p =
 !ifeq WXUNIV 1


@@ -174,10 +197,29 @@ __DEBUG_DEFINE_p = -d__WXDEBUG__
 !ifeq DEBUG_FLAG 1
 __DEBUG_DEFINE_p = -d__WXDEBUG__
 !endif
 !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 =
 __UNICODE_DEFINE_p =

+!ifeq UNICODE 0
+__UNICODE_DEFINE_p = -dwxUSE_UNICODE=0
+!endif

 !ifeq UNICODE 1
 __UNICODE_DEFINE_p = -d_UNICODE
 !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
 __DLLFLAG_p =
 !ifeq SHARED 1
 __DLLFLAG_p = -dWXUSINGDLL


@@ -185,15 +227,19 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 29
+COMPILER_PREFIX = wat

 OBJS = &
 OBJS = &

-       wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+       $(COMPILER_PREFIX)_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
+LIBDIRNAME = .\..\..\lib\$(COMPILER_PREFIX)_$(LIBTYPE_SUFFIX)$(CFG)

 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)
 SETUPHDIR = &
        $(LIBDIRNAME)\$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)

-FORTY_CXXFLAGS = $(__DEBUGINFO_0) $(__OPTIMIZEFLAG_2) -bm $(__RUNTIME_LIBS_5) &
-       -d__WXMSW__ $(__WXUNIV_DEFINE_p) $(__DEBUG_DEFINE_p) $(__UNICODE_DEFINE_p) &
-       -i=.\..\..\include -i=$(SETUPHDIR) -wcd=549 -wcd=656 -wcd=657 -i=. &
-       $(__DLLFLAG_p) -i=.\..\..\samples -dNOPCH $(__EXCEPTIONSFLAG_7) $(CPPFLAGS) &
+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) $(__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 &
        $(CXXFLAGS)
 FORTY_OBJECTS =  &
        $(OBJS)\forty_forty.obj &


@@ -219,6 +265,7 @@ clean : .SYMBOLIC
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk
        -if exist $(OBJS)\*.res del $(OBJS)\*.res
        -if exist $(OBJS)\*.lbc del $(OBJS)\*.lbc
        -if exist $(OBJS)\*.ilk del $(OBJS)\*.ilk

+       -if exist $(OBJS)\*.pch del $(OBJS)\*.pch

        -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe
 
 $(OBJS)\forty.exe :  $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
        -if exist $(OBJS)\forty.exe del $(OBJS)\forty.exe
 
 $(OBJS)\forty.exe :  $(FORTY_OBJECTS) $(OBJS)\forty_forty.res


@@ -226,10 +273,11 @@ $(OBJS)\forty.exe :  $(FORTY_OBJECTS) $(OBJS)\forty_forty.res
        @%append $(OBJS)\forty.lbc option quiet
        @%append $(OBJS)\forty.lbc name $^@
        @%append $(OBJS)\forty.lbc option caseexact
        @%append $(OBJS)\forty.lbc option quiet
        @%append $(OBJS)\forty.lbc name $^@
        @%append $(OBJS)\forty.lbc option caseexact

-       @%append $(OBJS)\forty.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16'
+       @%append $(OBJS)\forty.lbc  $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt_win ref '_WinMain@16' $(LDFLAGS)

        @for %i in ($(FORTY_OBJECTS)) do @%append $(OBJS)\forty.lbc file %i
        @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 wininet.lib) do @%append $(OBJS)\forty.lbc library %i

        @%append $(OBJS)\forty.lbc option resource=$(OBJS)\forty_forty.res
        @%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 
        wlink @$(OBJS)\forty.lbc
 
 data : .SYMBOLIC 


@@ -237,28 +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
        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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(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
 
 $(OBJS)\forty_forty.res :  .AUTODEPEND .\forty.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 -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 $<
+