fixed virtual function hiding for LoadBitmap()

[wxWidgets.git] / utils / makefile.gcc

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index f7a55a7c02709cefbb459dc23e000c1ad3a40067..37c0728332adf3e9c5768d11918d06c6f04dd58a 100644 (file)
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
 # =========================================================================
 #     This makefile was generated by

-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.9 (http://bakefile.sourceforge.net)

 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 


@@ -12,14 +12,18 @@ include ../build/msw/config.gcc
 
 ### Variables: ###
 
 
 ### Variables: ###
 

-MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
-       LDFLAGS="$(LDFLAGS)" CC="$(CC)" USE_GUI="$(USE_GUI)" \
-       MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
-       GCC_VERSION="$(GCC_VERSION)" USE_HTML="$(USE_HTML)" BUILD="$(BUILD)" \
-       DEBUG_INFO="$(DEBUG_INFO)" 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)" 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)" \
+       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)"

 
 ### Conditionally set variables: ###
 
 
 ### Conditionally set variables: ###
 


@@ -27,15 +31,34 @@ MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
 
 ### Targets: ###
 
 
 ### Targets: ###
 

-all: tex2rtf helpgen
+all: configtool emulator helpview tex2rtf helpgen

 
 clean: 
        -if exist .\*.o del .\*.o
 
 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

 
 

-helpgen: 
-       $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
+configtool: 
+       $(MAKE) -C configtool\src -f makefile.gcc $(MAKEARGS) all
+
+emulator: 
+       $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
+
+helpview: 
+       $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all

 
 tex2rtf: 
        $(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) all
 
 
 tex2rtf: 
        $(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) all
 

-.PHONY: all clean helpgen tex2rtf
+helpgen: 
+       $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean configtool emulator helpview tex2rtf helpgen
+
+
+# Dependencies tracking:
+-include ./*.d