another compilation fix, now for Unicode build

[wxWidgets.git] / utils / makefile.wat

diff --git a/utils/makefile.wat b/utils/makefile.wat
index 7f1131e55e0784bd56cf8044d8de623797426f86..f1a3bd5091e036f5d65445f8c96dd89271ac46db 100644 (file)
--- a/utils/makefile.wat
+++ b/utils/makefile.wat
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (http://www.bakefile.org)

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


@@ -36,19 +36,19 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &
        DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" &
        MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" &
        USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" &

-       USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" &
-       USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
+       USE_RICHTEXT="$(USE_RICHTEXT)" USE_STC="$(USE_STC)" &
+       USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" &

        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &
        USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" &

-       USE_THREADS="$(USE_THREADS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" &
-       VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" &
-       WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &
+       USE_THREADS="$(USE_THREADS)" USE_GDIPLUS="$(USE_GDIPLUS)" &
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" &
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" &

        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
        RUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 
 ### Targets: ###
 
        CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" &
        RUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 
 ### Targets: ###
 

-all : .SYMBOLIC configtool emulator helpview tex2rtf helpgen
+all : .SYMBOLIC emulator helpview ifacecheck

 
 clean : .SYMBOLIC 
        -if exist .\*.obj del .\*.obj
 
 clean : .SYMBOLIC 
        -if exist .\*.obj del .\*.obj


@@ -56,26 +56,15 @@ clean : .SYMBOLIC
        -if exist .\*.lbc del .\*.lbc
        -if exist .\*.ilk del .\*.ilk
        -if exist .\*.pch del .\*.pch
        -if exist .\*.lbc del .\*.lbc
        -if exist .\*.ilk del .\*.ilk
        -if exist .\*.pch del .\*.pch

-       cd configtool\src
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
-       cd $(WATCOM_CWD)

        cd emulator\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
        cd helpview\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
        cd emulator\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
        cd helpview\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)

-       cd tex2rtf\src
+       cd ifacecheck\src

        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
        cd $(WATCOM_CWD)

-       cd HelpGen
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) clean
-       cd $(WATCOM_CWD)
-
-configtool : .SYMBOLIC 
-       cd configtool\src
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
-       cd $(WATCOM_CWD)

 
 emulator : .SYMBOLIC 
        cd emulator\src
 
 emulator : .SYMBOLIC 
        cd emulator\src


@@ -87,13 +76,8 @@ helpview : .SYMBOLIC
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 

-tex2rtf : .SYMBOLIC 
-       cd tex2rtf\src
-       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
-       cd $(WATCOM_CWD)
-
-helpgen : .SYMBOLIC 
-       cd HelpGen
+ifacecheck : .SYMBOLIC 
+       cd ifacecheck\src

        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)