X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e1e61c81bdadbb76862314841528c51f6ecf07e1..b1fd3badf513567620a81ea8a428b6c9b7753954:/utils/makefile.vc

diff --git a/utils/makefile.vc b/utils/makefile.vc
index bf71de1329..de6e2aff95 100644
--- a/utils/makefile.vc
+++ b/utils/makefile.vc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,14 +12,19 @@
 
 ### Variables: ###
 
-MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
-	LDFLAGS="$(LDFLAGS)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" CC="$(CC)" \
-	USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
-	USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" DEBUG_INFO="$(DEBUG_INFO)" \
-	USE_EXCEPTIONS="$(USE_EXCEPTIONS)" VENDOR="$(VENDOR)" UNICODE="$(UNICODE)" \
-	OFFICIAL_BUILD="$(OFFICIAL_BUILD)" MSLU="$(MSLU)" WXUNIV="$(WXUNIV)" \
-	RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" \
-	SHARED="$(SHARED)" USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"
+MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
+	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
+	WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
+	TARGET_CPU="$(TARGET_CPU)" DEBUG_INFO="$(DEBUG_INFO)" \
+	DEBUG_FLAG="$(DEBUG_FLAG)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" \
+	MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
+	USE_XRC="$(USE_XRC)" 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)" \
+	CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \
+	RUNTIME_LIBS="$(RUNTIME_LIBS)"
 
 ### Conditionally set variables: ###
 
@@ -32,6 +37,22 @@ all: sub_configtool sub_emulator sub_helpview sub_tex2rtf sub_helpgen
 clean: 
 	-if exist .\*.obj del .\*.obj
 	-if exist .\*.res del .\*.res
+	-if exist .\*.pch del .\*.pch
+	cd configtool\src
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd emulator\src
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd helpview\src
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd tex2rtf\src
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
+	cd HelpGen
+	$(MAKE) -f makefile.vc $(MAKEARGS) clean
+	cd $(MAKEDIR)
 
 sub_configtool: 
 	cd configtool\src
@@ -43,11 +64,6 @@ sub_emulator:
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-sub_helpgen: 
-	cd HelpGen
-	$(MAKE) -f makefile.vc $(MAKEARGS) all
-	cd $(MAKEDIR)
-
 sub_helpview: 
 	cd helpview\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
@@ -57,3 +73,9 @@ sub_tex2rtf:
 	cd tex2rtf\src
 	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
+
+sub_helpgen: 
+	cd HelpGen
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
+	cd $(MAKEDIR)
+