Tinderbox build fix.

[wxWidgets.git] / utils / makefile.bcc

diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index 3cc8381f2c03c3a9cad0e217e83b2431df2015c8..c7590f1e706cfbd12b6e327acf0beba0e6d3b297 100644 (file)
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -27,14 +27,15 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
        -DUNICODE="$(UNICODE)" -DMSLU="$(MSLU)" -DBUILD="$(BUILD)" \
        -DDEBUG_INFO="$(DEBUG_INFO)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
        -DMONOLITHIC="$(MONOLITHIC)" -DUSE_GUI="$(USE_GUI)" \
-       -DUSE_HTML="$(USE_HTML)" -DUSE_XRC="$(USE_XRC)" \
+       -DUSE_HTML="$(USE_HTML)" -DUSE_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
+       -DUSE_AUI="$(USE_AUI)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
        -DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \
        -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
-       -DUSE_THREADS="$(USE_THREADS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-       -DVENDOR="$(VENDOR)" -DWX_FLAVOUR="$(WX_FLAVOUR)" \
-       -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" -DCFG="$(CFG)" \
-       -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
-       -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
+       -DUSE_THREADS="$(USE_THREADS)" -DUSE_GDIPLUS="$(USE_GDIPLUS)" \
+       -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" -DVENDOR="$(VENDOR)" \
+       -DWX_FLAVOUR="$(WX_FLAVOUR)" -DWX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" \
+       -DCFG="$(CFG)" -DCPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+       -DCPPUNIT_LIBS="$(CPPUNIT_LIBS)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###
 
@@ -42,16 +43,12 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 
 ### Targets: ###
 
-all: configtool emulator helpview tex2rtf helpgen
+all: emulator helpview tex2rtf helpgen
 
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
        -if exist .\*.csm del .\*.csm
-       @echo cd configtool\src >configtool.bat
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>configtool.bat
-       call configtool.bat
-       @del configtool.bat
        @echo cd emulator\src >emulator.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>emulator.bat
        call emulator.bat
@@ -69,12 +66,6 @@ clean:
        call helpgen.bat
        @del helpgen.bat
 
-configtool: 
-       @echo cd configtool\src >configtool.bat
-       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>configtool.bat
-       call configtool.bat
-       @del configtool.bat
-
 emulator: 
        @echo cd emulator\src >emulator.bat
        @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>emulator.bat