X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b17c1746930b29c13d5bfff0009721cbcefa53f1..8329fea8ad89a4df6c2f0441facdc5ad189473ea:/utils/makefile.bcc?ds=sidebyside

diff --git a/utils/makefile.bcc b/utils/makefile.bcc
index 32ee71efcb..436ad66daf 100644
--- a/utils/makefile.bcc
+++ b/utils/makefile.bcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -26,10 +26,13 @@ MAKEARGS = -DCC="$(CC)" -DCXX="$(CXX)" -DCFLAGS="$(CFLAGS)" \
 	-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_GUI="$(USE_GUI)" -DUSE_HTML="$(USE_HTML)" -DUSE_XRC="$(USE_XRC)" \
 	-DUSE_OPENGL="$(USE_OPENGL)" -DUSE_ODBC="$(USE_ODBC)" \
 	-DUSE_EXCEPTIONS="$(USE_EXCEPTIONS)" -DOFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-	-DVENDOR="$(VENDOR)" -DCFG="$(CFG)" -DRUNTIME_LIBS="$(RUNTIME_LIBS)"
+	-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,28 +45,53 @@ all: configtool emulator helpview tex2rtf helpgen
 clean: 
 	-if exist .\*.obj del .\*.obj
 	-if exist .\*.res del .\*.res
+	@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
+	@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 >helpgen.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) clean >>helpgen.bat
+	call helpgen.bat
+	@del helpgen.bat
 
 configtool: 
-	cd configtool\src
-	$(MAKE) -f makefile.bcc $(MAKEARGS) all
-	cd ..\..
+	@echo cd configtool\src >configtool.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>configtool.bat
+	call configtool.bat
+	@del configtool.bat
 
 emulator: 
-	cd emulator\src
-	$(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: 
-	cd HelpGen
-	$(MAKE) -f makefile.bcc $(MAKEARGS) all
-	cd ..
+	@echo cd HelpGen >helpgen.bat
+	@echo $(MAKE) -f makefile.bcc $(MAKEARGS) all >>helpgen.bat
+	call helpgen.bat
+	@del helpgen.bat