added default value (0) for flags argument of AdjustForParentClientOrigin()

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

diff --git a/samples/opengl/makefile.gcc b/samples/opengl/makefile.gcc
index fa189a395644bd70b64209eb3525b31a2bbf370f..887ef816aa3a70cb9c670adc7f7f481889fdb9a6 100644 (file)
--- a/samples/opengl/makefile.gcc
+++ b/samples/opengl/makefile.gcc
@@ -4,7 +4,7 @@
 #     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,15 @@ include ../../build/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)" USE_EXCEPTIONS="$(USE_EXCEPTIONS)" \
+       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)"
 
 ### Conditionally set variables: ###
 
@@ -25,12 +34,12 @@ clean:
        -if exist .\*.o del .\*.o
 
 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