X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f509d00d20544af7ae57eb671c51863e0973af9f..d83eeece0ee86a3ad81096d894a560647cef0d3a:/samples/html/makefile.vc

diff --git a/samples/html/makefile.vc b/samples/html/makefile.vc
index 079e974c4b..5825c1d2f4 100644
--- a/samples/html/makefile.vc
+++ b/samples/html/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)" \
+	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,48 +27,48 @@
 
 ### Targets: ###
 
-all: about help helpview printing test virtual widget zip
+all: sub_about sub_help sub_helpview sub_printing sub_test sub_virtual sub_widget sub_zip
 
-about: 
+sub_about: 
 	cd about
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
 clean: 
 	-if exist .\*.obj del .\*.obj
 	-if exist .\*.res del .\*.res
 
-help: 
+sub_help: 
 	cd help
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-helpview: 
+sub_helpview: 
 	cd helpview
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-printing: 
+sub_printing: 
 	cd printing
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-test: 
+sub_test: 
 	cd test
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-virtual: 
+sub_virtual: 
 	cd virtual
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-widget: 
+sub_widget: 
 	cd widget
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)
 
-zip: 
+sub_zip: 
 	cd zip
-	$(MAKE) /$(MAKEFLAGS) all
+	$(MAKE) -f makefile.vc $(MAKEARGS) all
 	cd $(MAKEDIR)