Rebaked makefiles after htmllistbox and collapsable panel additions.

[wxWidgets.git] / utils / makefile.wat

diff --git a/utils/makefile.wat b/utils/makefile.wat
index 7f1131e55e0784bd56cf8044d8de623797426f86..bf09f734cb54e0ba14ab000b755f2c71fda98592 100644 (file)
--- a/utils/makefile.wat
+++ b/utils/makefile.wat
@@ -39,16 +39,16 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" &
        USE_RICHTEXT="$(USE_RICHTEXT)" USE_OPENGL="$(USE_OPENGL)" &
        USE_ODBC="$(USE_ODBC)" USE_QA="$(USE_QA)" &
        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: ###
 
-all : .SYMBOLIC configtool emulator helpview tex2rtf helpgen
+all : .SYMBOLIC emulator helpview tex2rtf helpgen
 
 clean : .SYMBOLIC 
        -if exist .\*.obj del .\*.obj
@@ -56,9 +56,6 @@ clean : .SYMBOLIC
        -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)
@@ -72,11 +69,6 @@ clean : .SYMBOLIC
        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
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all