applied patch 1465549

[wxWidgets.git] / utils / makefile.gcc

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 8ef3711f8dfa1657e8fff17417860ab059b1d1a8..20592cbcb77023fc36e9a16402e5b9d0e7be9f06 100644 (file)
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -13,14 +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_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
-       VENDOR="$(VENDOR)" WX_FLAVOUR="$(WX_FLAVOUR)" \
-       WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \
+       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)" GCC_VERSION="$(GCC_VERSION)"
 
@@ -34,6 +35,7 @@ all: configtool 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
@@ -56,3 +58,7 @@ helpgen:
        $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
 
 .PHONY: all clean configtool emulator helpview tex2rtf helpgen
+
+
+# Dependencies tracking:
+-include ./*.d