Minor tweaks to bring up to date with CVS changes

[wxWidgets.git] / contrib / samples / foldbar / foldpanelbar / makefile.wat

diff --git a/contrib/samples/foldbar/foldpanelbar/makefile.wat b/contrib/samples/foldbar/foldpanelbar/makefile.wat
index 6de56b5745bb506e967aa0aeec16c551b995f393..80189f4f5883e4e38add4de443ef8c7e76faa65f 100644 (file)
--- a/contrib/samples/foldbar/foldpanelbar/makefile.wat
+++ b/contrib/samples/foldbar/foldpanelbar/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.8 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)

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


@@ -201,7 +201,7 @@ __DLLFLAG_p = -dWXUSINGDLL
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-WX_RELEASE_NODOT = 25
+WX_RELEASE_NODOT = 27

 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)


@@ -210,7 +210,7 @@ SETUPHDIR = &
 FOLDTEST_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) &
 FOLDTEST_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 &
+       $(__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)
        -wcd=656 -wcd=657 -wcd=667 -i=. $(__DLLFLAG_p) -i=.\..\..\..\..\samples &
        -dNOPCH -i=.\..\..\..\include $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) &
        $(CPPFLAGS) $(CXXFLAGS)


@@ -246,20 +246,21 @@ $(OBJS)\foldtest.exe :  $(FOLDTEST_OBJECTS) $(OBJS)\foldtest_foldpanelbartest.re
        @for %i in ($(FOLDTEST_OBJECTS)) do @%append $(OBJS)\foldtest.lbc file %i
        @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.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)\foldtest.lbc library %i
        @%append $(OBJS)\foldtest.lbc option resource=$(OBJS)\foldtest_foldpanelbartest.res
        @for %i in ($(FOLDTEST_OBJECTS)) do @%append $(OBJS)\foldtest.lbc file %i
        @for %i in ( wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR)_foldbar.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)\foldtest.lbc library %i
        @%append $(OBJS)\foldtest.lbc option resource=$(OBJS)\foldtest_foldpanelbartest.res

+       @for %i in () do @%append $(OBJS)\foldtest.lbc option stack=%i

        wlink @$(OBJS)\foldtest.lbc
 
 $(OBJS)\foldtest_foldpanelbartest.obj :  .AUTODEPEND .\foldpanelbartest.cpp
        wlink @$(OBJS)\foldtest.lbc
 
 $(OBJS)\foldtest_foldpanelbartest.obj :  .AUTODEPEND .\foldpanelbartest.cpp

-       $(CXX) -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<

 
 $(OBJS)\foldtest_foldtestpanel.obj :  .AUTODEPEND .\foldtestpanel.cpp
 
 $(OBJS)\foldtest_foldtestpanel.obj :  .AUTODEPEND .\foldtestpanel.cpp

-       $(CXX) -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<

 
 $(OBJS)\foldtest_layouttest.obj :  .AUTODEPEND .\layouttest.cpp
 
 $(OBJS)\foldtest_layouttest.obj :  .AUTODEPEND .\layouttest.cpp

-       $(CXX) -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<

 
 $(OBJS)\foldtest_test.obj :  .AUTODEPEND .\test.cpp
 
 $(OBJS)\foldtest_test.obj :  .AUTODEPEND .\test.cpp

-       $(CXX) -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(FOLDTEST_CXXFLAGS) $<

 
 $(OBJS)\foldtest_foldpanelbartest.res :  .AUTODEPEND .\foldpanelbartest.rc
 
 $(OBJS)\foldtest_foldpanelbartest.res :  .AUTODEPEND .\foldpanelbartest.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 -i=.\..\..\..\include $<
+       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 -dNOPCH -i=.\..\..\..\include $<