X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d90d6ea7a007332aa75779f90b30ed39872e494..d774f9161c7f63060fbdfdcbcd3d60bf2fa65262:/utils/makefile.gcc

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 37c0728332..83804d6825 100644
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.1 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -13,13 +13,15 @@ include ../build/msw/config.gcc
 ### Variables: ###
 
 MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
-	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" SHARED="$(SHARED)" \
+	CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" \
 	WXUNIV="$(WXUNIV)" UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \
 	DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
 	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)" \
+	USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" USE_AUI="$(USE_AUI)" \
+	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)" 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)" \
@@ -31,20 +33,16 @@ MAKEARGS = CC="$(CC)" CXX="$(CXX)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" \
 
 ### Targets: ###
 
-all: configtool emulator helpview tex2rtf helpgen
+all: emulator helpview tex2rtf helpgen
 
 clean: 
 	-if exist .\*.o del .\*.o
 	-if exist .\*.d del .\*.d
-	$(MAKE) -C configtool\src -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) clean
 	$(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) clean
 
-configtool: 
-	$(MAKE) -C configtool\src -f makefile.gcc $(MAKEARGS) all
-
 emulator: 
 	$(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
 
@@ -57,7 +55,7 @@ tex2rtf:
 helpgen: 
 	$(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean configtool emulator helpview tex2rtf helpgen
+.PHONY: all clean emulator helpview tex2rtf helpgen
 
 
 # Dependencies tracking: