Remove malloc.h

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

diff --git a/utils/HelpGen/src/makefile.wat b/utils/HelpGen/src/makefile.wat
index cb5570630040696ddb61f65dca00032f9cfdd4a7..5cb8acde9beb5ca17fcc66be58d709d3e710e41a 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.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -181,18 +181,6 @@ __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
-!endif
 
 ### Variables: ###
 
@@ -205,7 +193,7 @@ 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 &
+       $(__UNICODE_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 =  &
@@ -242,8 +230,9 @@ $(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)  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