--with-sdl option should be taken into account for non-GUI builds too (closes bug...

[wxWidgets.git] / utils / makefile.bcc

diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index 8bd811d58822d09fa4352b09f59d5350864d8f5f..f91b0697513dd34675b1f3113d27ccafe6dd8239 100644 (file)
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -1,10 +1,15 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
+.autodepend
+
 !ifndef BCCDIR
+!ifndef MAKEDIR
+!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
+!endif
 BCCDIR = $(MAKEDIR)\..
 !endif
 
@@ -14,21 +19,24 @@ BCCDIR = $(MAKEDIR)\..
 # Do not modify the rest of this file!
 # -------------------------------------------------------------------------
 
-!if "$(BCCDIR)" == "\.."
-!error Your Borland compiler does not define MAKEDIR. Please define the BCCDIR variable, e.g. BCCDIR=d:\bc4
-!endif
-
 ### Variables: ###
 
-MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
-       -DLDFLAGS="$(LDFLAGS)" -DCC="$(CC)" -DUSE_GUI="$(USE_GUI)" \
-       -DMONOLITHIC="$(MONOLITHIC)" -DCXXFLAGS="$(CXXFLAGS)" \
-       -DUSE_HTML="$(USE_HTML)" -DBUILD="$(BUILD)" -DDEBUG_INFO="$(DEBUG_INFO)" \
-       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DVENDOR="$(VENDOR)" \
-       -DUNICODE="$(UNICODE)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-       -DMSLU="$(MSLU)" -DWXUNIV="$(WXUNIV)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)" \
-       -DCXX="$(CXX)" -DCFG="$(CFG)" -DCFLAGS="$(CFLAGS)" -DSHARED="$(SHARED)" \
-       -DUSE_ODBC="$(USE_ODBC)" -DUSE_OPENGL="$(USE_OPENGL)"
+MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
+       -DCXXFLAGS="$(CXXFLAGS)" -DCPPFLAGS="$(CPPFLAGS)" -DLDFLAGS="$(LDFLAGS)" \
+       -DCPP="$(CPP)" -DSHARED="$(SHARED)" -DWXUNIV="$(WXUNIV)" \
+       -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_MEDIA="$(USE_MEDIA)" -DUSE_XRC="$(USE_XRC)" \
+       -DUSE_AUI="$(USE_AUI)" -DUSE_RICHTEXT="$(USE_RICHTEXT)" \
+       -DUSE_STC="$(USE_STC)" -DUSE_OPENGL="$(USE_OPENGL)" \
+       -DUSE_ODBC="$(USE_ODBC)" -DUSE_QA="$(USE_QA)" \
+       -DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DUSE_RTTI="$(USE_RTTI)" \
+       -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: ###
 
@@ -36,33 +44,50 @@ MAKEARGS = -DCPPFLAGS="$(CPPFLAGS)" -DDEBUG_FLAG="$(DEBUG_FLAG)" \
 
 ### Targets: ###
 
-all: configtool emulator helpview tex2rtf helpgen
+all: emulator helpview tex2rtf helpgen
 
 clean: 
        -if exist .\*.obj del .\*.obj
        -if exist .\*.res del .\*.res
-
-configtool: 
-       cd configtool\src
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..\..
+       -if exist .\*.csm del .\*.csm
+       @echo cd emulator\src >emulator.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>emulator.bat
+       call emulator.bat
+       @del emulator.bat
+       @echo cd helpview\src >helpview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpview.bat
+       call helpview.bat
+       @del helpview.bat
+       @echo cd tex2rtf\src >tex2rtf.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>tex2rtf.bat
+       call tex2rtf.bat
+       @del tex2rtf.bat
+       @echo cd HelpGen\src >helpgen.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpgen.bat
+       call helpgen.bat
+       @del helpgen.bat
 
 emulator: 
-       cd emulator\src
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..\..
-
-helpgen: 
-       cd HelpGen
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..
+       @echo cd emulator\src >emulator.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>emulator.bat
+       call emulator.bat
+       @del emulator.bat
 
 helpview: 
-       cd helpview\src
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..\..
+       @echo cd helpview\src >helpview.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpview.bat
+       call helpview.bat
+       @del helpview.bat
 
 tex2rtf: 
-       cd tex2rtf\src
-       $(MAKE) -f makefile.bcc $(MAKEARGS) all
-       cd ..\..
+       @echo cd tex2rtf\src >tex2rtf.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>tex2rtf.bat
+       call tex2rtf.bat
+       @del tex2rtf.bat
+
+helpgen: 
+       @echo cd HelpGen\src >helpgen.bat
+       @echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpgen.bat
+       call helpgen.bat
+       @del helpgen.bat
+