X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e93c6860edf545074ef6046e19b58ab5d5843ca5..39d85e3caaa8dd8e7b1fa52f54faa33b3a78a32b:/samples/opengl/makefile.gcc

diff --git a/samples/opengl/makefile.gcc b/samples/opengl/makefile.gcc
index fa189a3956..b1a35cf5ac 100644
--- 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,14 @@ 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)" 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 +33,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