reintroducing former default, reverting Robert's change to make graphiccontext enable...

[wxWidgets.git] / utils / makefile.gcc

diff --git a/utils/makefile.gcc b/utils/makefile.gcc
index 7556b5287b0052c6f82412d73a9a48f6d763bc5f..0fed5d664cb0f9b00a3a60458fe476029ff0df3f 100644 (file)
--- a/utils/makefile.gcc
+++ b/utils/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.2.3 (http://www.bakefile.org)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,13 +12,22 @@ include ../build/msw/config.gcc
 
 ### 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 = LINK_DLL_FLAGS="$(LINK_DLL_FLAGS)" \
+       LINK_MODULE_FLAGS="$(LINK_MODULE_FLAGS)" 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_STC="$(USE_STC)" \
+       USE_OPENGL="$(USE_OPENGL)" 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: ###
 
@@ -26,15 +35,28 @@ MAKEARGS = CPPFLAGS=$(CPPFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) LDFLAGS=$(LDFLAGS) \
 
 ### Targets: ###
 
-all: tex2rtf helpgen
+all: emulator helpview ifacecheck
 
 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 ifacecheck\src -f makefile.gcc $(MAKEARGS) clean
 
-helpgen: 
-       $(MAKE) -C HelpGen -f makefile.gcc $(MAKEARGS) all
+emulator: 
+       $(MAKE) -C emulator\src -f makefile.gcc $(MAKEARGS) all
 
-tex2rtf: 
-       $(MAKE) -C tex2rtf\src -f makefile.gcc $(MAKEARGS) all
+helpview: 
+       $(MAKE) -C helpview\src -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all clean helpgen tex2rtf
+ifacecheck: 
+       $(MAKE) -C ifacecheck\src -f makefile.gcc $(MAKEARGS) all
+
+.PHONY: all clean emulator helpview ifacecheck
+
+
+SHELL := $(COMSPEC)
+
+# Dependencies tracking:
+-include ./*.d