X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e93c6860edf545074ef6046e19b58ab5d5843ca5..0d8b87ac8ae0ababd4c0d725142532f6d592fdb2:/samples/opengl/makefile.vc

diff --git a/samples/opengl/makefile.vc b/samples/opengl/makefile.vc
index eb30252961..bd68f3a0ef 100644
--- a/samples/opengl/makefile.vc
+++ b/samples/opengl/makefile.vc
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include <../../build/config.vc>
+!include <../../build/msw/config.vc>
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -12,6 +12,14 @@
 
 ### Variables: ###
 
+MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" \
+	LDFLAGS="$(LDFLAGS)" DEBUG_RUNTIME_LIBS="$(DEBUG_RUNTIME_LIBS)" CC="$(CC)" \
+	USE_GUI="$(USE_GUI)" MONOLITHIC="$(MONOLITHIC)" CXXFLAGS="$(CXXFLAGS)" \
+	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: ###
 
@@ -19,23 +27,23 @@
 
 ### Targets: ###
 
-all: cube isosurf penguin
+all: sub_cube sub_isosurf sub_penguin
 
 clean: 
 	-if exist .\*.obj del .\*.obj
 	-if exist .\*.res del .\*.res
 
-cube: 
+sub_cube: 
 	cd cube
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-isosurf: 
+sub_isosurf: 
 	cd isosurf
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-penguin: 
+sub_penguin: 
 	cd penguin
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)