Fix wrong configure test for abi::__forced_unwind in previous commit.

[wxWidgets.git] / utils / makefile.gcc

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index ed82cb1a0ba70c3d8005c98dda157e9a9af9c948..f09296073e5fc2f7055af5b55078696efeafa50e 100644 (file)
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,62 +1,80 @@
-# =========================================================================
-#     This makefile was generated by
-#     Bakefile 0.2.0 (http://bakefile.sourceforge.net)
-#     Do not modify, all changes will be overwritten!
-# =========================================================================
-
-include ../build/msw/config.gcc
-
-# -------------------------------------------------------------------------
-# Do not modify the rest of this file!
-# -------------------------------------------------------------------------
-
-### Variables: ###
-
-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)" \
-       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \
-       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \
-       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)" \
-       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"
-
-### Conditionally set variables: ###
-
-
-
-### Targets: ###
-
-all: emulator helpview tex2rtf helpgen
-
-clean: 
-       -if exist .\*.o del .\*.o
-       -if exist .\*.d del .\*.d
-       $(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
-
-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
-
-helpgen: 
-       $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
-
-.PHONY: all clean emulator helpview tex2rtf helpgen
-
-
-# Dependencies tracking:
--include ./*.d
+# =========================================================================\r
+#     This makefile was generated by\r
+#     Bakefile 0.2.9 (http://www.bakefile.org)\r
+#     Do not modify, all changes will be overwritten!\r
+# =========================================================================\r
+\r
+include ../build/msw/config.gcc\r
+\r
+# -------------------------------------------------------------------------\r
+# Do not modify the rest of this file!\r
+# -------------------------------------------------------------------------\r
+\r
+### Variables: ###\r
+\r
+MAKEARGS = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \\r
+       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" CC="$(CC)" CXX="$(CXX)" \\r
+       CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" CPPFLAGS="$(CPPFLAGS)" \\r
+       LDFLAGS="$(LDFLAGS)" CPP="$(CPP)" SHARED="$(SHARED)" WXUNIV="$(WXUNIV)" \\r
+       UNICODE="$(UNICODE)" MSLU="$(MSLU)" BUILD="$(BUILD)" \\r
+       DEBUG_INFO="$(DEBUG_INFO)" DEBUG_FLAG="$(DEBUG_FLAG)" \\r
+       MONOLITHIC="$(MONOLITHIC)" USE_GUI="$(USE_GUI)" USE_HTML="$(USE_HTML)" \\r
+       USE_WEBVIEW="$(USE_WEBVIEW)" USE_MEDIA="$(USE_MEDIA)" USE_XRC="$(USE_XRC)" \\r
+       USE_AUI="$(USE_AUI)" USE_RIBBON="$(USE_RIBBON)" \\r
+       USE_PROPGRID="$(USE_PROPGRID)" USE_RICHTEXT="$(USE_RICHTEXT)" \\r
+       USE_STC="$(USE_STC)" USE_OPENGL="$(USE_OPENGL)" USE_QA="$(USE_QA)" \\r
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" USE_RTTI="$(USE_RTTI)" \\r
+       USE_THREADS="$(USE_THREADS)" USE_CAIRO="$(USE_CAIRO)" \\r
+       OFFICIAL_BUILD="$(OFFICIAL_BUILD)" VENDOR="$(VENDOR)" \\r
+       WX_FLAVOUR="$(WX_FLAVOUR)" WX_LIB_FLAVOUR="$(WX_LIB_FLAVOUR)" CFG="$(CFG)" \\r
+       CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" CPPUNIT_LIBS="$(CPPUNIT_LIBS)" \\r
+       RUNTIME_LIBS="$(RUNTIME_LIBS)" GCC_VERSION="$(GCC_VERSION)"\r
+\r
+### Conditionally set variables: ###\r
+\r
+\r
+\r
+### Targets: ###\r
+\r
+all: emulator execmon helpview hhp2cached ifacecheck screenshotgen wxrc\r
+\r
+clean: \r
+       -if exist .\*.o del .\*.o\r
+       -if exist .\*.d del .\*.d\r
+       $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) clean\r
+       $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) clean\r
+\r
+emulator: \r
+       $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all\r
+\r
+execmon: \r
+       $(MAKE) -C execmon -f makefile.gcc $(MAKEARGS) all\r
+\r
+helpview: \r
+       $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all\r
+\r
+hhp2cached: \r
+       $(MAKE) -C hhp2cached -f makefile.gcc $(MAKEARGS) all\r
+\r
+ifacecheck: \r
+       $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) all\r
+\r
+screenshotgen: \r
+       $(MAKE) -C screenshotgen\src -f makefile.gcc $(MAKEARGS) all\r
+\r
+wxrc: \r
+       $(MAKE) -C wxrc -f makefile.gcc $(MAKEARGS) all\r
+\r
+.PHONY: all clean emulator execmon helpview hhp2cached ifacecheck screenshotgen \\r
+       wxrc\r
+\r
+\r
+SHELL := $(COMSPEC)\r
+\r
+# Dependencies tracking:\r
+-include ./*.d\r