reverted m_adjustMinSize change prepatory for a new approach to fix

[wxWidgets.git] / samples / opengl / makefile.gcc

diff --git a/samples/opengl/makefile.gcc b/samples/opengl/makefile.gcc
index fa189a395644bd70b64209eb3525b31a2bbf370f..dfc6dd8b6713aaf40a6e26dab52cd75951202d9c 100644 (file)
--- a/samples/opengl/makefile.gcc
+++ b/samples/opengl/makefile.gcc
@@ -1,10 +1,10 @@
 # =========================================================================
 #     This makefile was generated by
-#     Bakefile 0.1.1 (http://bakefile.sourceforge.net)
+#     Bakefile 0.1.4 (http://bakefile.sourceforge.net)
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-include ../../build/config.gcc
+include ../../build/msw/config.gcc
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -12,6 +12,16 @@ include ../../build/config.gcc
 
 ### Variables: ###
 
+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)" CPPUNIT_CFLAGS="$(CPPUNIT_CFLAGS)" \
+       CPPUNIT_LIBS="$(CPPUNIT_LIBS)" RUNTIME_LIBS="$(RUNTIME_LIBS)" \
+       GCC_VERSION="$(GCC_VERSION)"
 
 ### Conditionally set variables: ###
 
@@ -23,14 +33,17 @@ all: cube isosurf penguin
 
 clean: 
        -if exist .\*.o del .\*.o
+       $(MAKE) -C cube -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) clean
+       $(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) clean
 
 cube: 
-       (cd cube && $(MAKE) all)
+       $(MAKE) -C cube -f makefile.gcc $(MAKEARGS) all
 
 isosurf: 
-       (cd isosurf && $(MAKE) all)
+       $(MAKE) -C isosurf -f makefile.gcc $(MAKEARGS) all
 
 penguin: 
-       (cd penguin && $(MAKE) all)
+       $(MAKE) -C penguin -f makefile.gcc $(MAKEARGS) all
 
 .PHONY: all clean cube isosurf penguin