makefiles update

[wxWidgets.git] / demos / makefile.gcc

diff --git a/demos/makefile.gcc b/demos/makefile.gcc
index ce83bfa3862439fe7bf97994ffd450e0a55051a6..2c5f462ca97c01409c5b7e9fabb189728e0f7b7d 100644 (file)
--- a/demos/makefile.gcc
+++ b/demos/makefile.gcc
@@ -1,6 +1,6 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.2 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
@@ -12,13 +12,15 @@ 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 = 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_OPENGL="$(USE_OPENGL)" USE_ODBC="$(USE_ODBC)" \
+       USE_EXCEPTIONS="$(USE_EXCEPTIONS)" OFFICIAL_BUILD="$(OFFICIAL_BUILD)" \
+       VENDOR="$(VENDOR)" CFG="$(CFG)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
+       GCC_VERSION="$(GCC_VERSION)"
 
 ### Conditionally set variables: ###
 
@@ -28,12 +30,12 @@ MAKEARGS = CPPFLAGS=$(CPPFLAGS) DEBUG_FLAG=$(DEBUG_FLAG) LDFLAGS=$(LDFLAGS) \
 
 all: bombs dbbrowse forty fractal life poem
 
-bombs: 
-       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) all
-
 clean: 
        -if exist .\*.o del .\*.o
 
+bombs: 
+       $(MAKE) -C bombs -f makefile.gcc $(MAKEARGS) all
+
 dbbrowse: 
        $(MAKE) -C dbbrowse -f makefile.gcc $(MAKEARGS) all
 
@@ -49,4 +51,4 @@ life:
 poem: 
        $(MAKE) -C poem -f makefile.gcc $(MAKEARGS) all
 
-.PHONY: all bombs clean dbbrowse forty fractal life poem
+.PHONY: all clean bombs dbbrowse forty fractal life poem