changed wxFFileOutput/InputStream ctor 'mode' argument to wxString

[wxWidgets.git] / utils / HelpGen / src / makefile.wat

diff --git a/utils/HelpGen/src/makefile.wat b/utils/HelpGen/src/makefile.wat
index dfd1110421672cfd73c6a891dad5ff757c624921..b103f142769f7da69ef018110505038cda92ac3f 100644 (file)
--- a/utils/HelpGen/src/makefile.wat
+++ b/utils/HelpGen/src/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -167,6 +167,10 @@ __UNICODE_DEFINE_p =
 !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
@@ -181,22 +185,14 @@ __WXLIB_MONO_p =
 __WXLIB_MONO_p = &
        wx$(PORTNAME)$(WXUNIVNAME)$(WX_RELEASE_NODOT)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WX_LIB_FLAVOUR).lib
 !endif
-__LIB_TIFF_p =
-!ifeq USE_GUI 1
-__LIB_TIFF_p = wxtiff$(WXDEBUGFLAG).lib
-!endif
-__LIB_JPEG_p =
-!ifeq USE_GUI 1
-__LIB_JPEG_p = wxjpeg$(WXDEBUGFLAG).lib
-!endif
-__LIB_PNG_p =
-!ifeq USE_GUI 1
-__LIB_PNG_p = wxpng$(WXDEBUGFLAG).lib
+__GDIPLUS_LIB_p =
+!ifeq USE_GDIPLUS 1
+__GDIPLUS_LIB_p = gdiplus.lib
 !endif
 
 ### Variables: ###
 
-WX_RELEASE_NODOT = 26
+WX_RELEASE_NODOT = 29
 OBJS = &
        wat_$(PORTNAME)$(WXUNIVNAME)$(WXUNICODEFLAG)$(WXDEBUGFLAG)$(WXDLLFLAG)$(CFG)
 LIBDIRNAME = .\..\..\..\lib\wat_$(LIBTYPE_SUFFIX)$(CFG)
@@ -205,9 +201,10 @@ SETUPHDIR = &
 HELPGEN_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) -dwxUSE_GUI=0 $(__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) -dwxUSE_GUI=0 $(__RTTIFLAG_7) $(__EXCEPTIONSFLAG_8) &
+       $(CPPFLAGS) $(CXXFLAGS)
 HELPGEN_OBJECTS =  &
        $(OBJS)\HelpGen_HelpGen.obj &
        $(OBJS)\HelpGen_cjparser.obj &
@@ -242,31 +239,32 @@ $(OBJS)\HelpGen.exe :  $(HELPGEN_OBJECTS)
        @%append $(OBJS)\HelpGen.lbc option caseexact
        @%append $(OBJS)\HelpGen.lbc $(LDFLAGS) $(__DEBUGINFO_1)  libpath $(LIBDIRNAME) system nt ref 'main_'
        @for %i in ($(HELPGEN_OBJECTS)) do @%append $(OBJS)\HelpGen.lbc file %i
-       @for %i in ( $(__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)\HelpGen.lbc library %i
+       @for %i in ( $(__WXLIB_BASE_p)  $(__WXLIB_MONO_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 odbc32.lib) do @%append $(OBJS)\HelpGen.lbc library %i
        @%append $(OBJS)\HelpGen.lbc
+       @for %i in () do @%append $(OBJS)\HelpGen.lbc option stack=%i
        wlink @$(OBJS)\HelpGen.lbc
 
 $(OBJS)\HelpGen_HelpGen.obj :  .AUTODEPEND .\HelpGen.cpp
-       $(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
 
 $(OBJS)\HelpGen_cjparser.obj :  .AUTODEPEND .\cjparser.cpp
-       $(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
 
 $(OBJS)\HelpGen_docripper.obj :  .AUTODEPEND .\docripper.cpp
-       $(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
 
 $(OBJS)\HelpGen_ifcontext.obj :  .AUTODEPEND .\ifcontext.cpp
-       $(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
 
 $(OBJS)\HelpGen_markup.obj :  .AUTODEPEND .\markup.cpp
-       $(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
 
 $(OBJS)\HelpGen_scriptbinder.obj :  .AUTODEPEND .\scriptbinder.cpp
-       $(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
 
 $(OBJS)\HelpGen_sourcepainter.obj :  .AUTODEPEND .\sourcepainter.cpp
-       $(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
 
 $(OBJS)\HelpGen_srcparser.obj :  .AUTODEPEND .\srcparser.cpp
-       $(CXX) -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<
+       $(CXX) -bt=nt -zq -fo=$^@ $(HELPGEN_CXXFLAGS) $<