fixed modal dialogs after event loop change

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

diff --git a/samples/html/makefile.gcc b/samples/html/makefile.gcc
index b4edcb38fefe42893e247539cdf46f1b68e55f07..ca7367058cb980f238961521503004650e9cbfe3 100644 (file)
--- a/samples/html/makefile.gcc
+++ b/samples/html/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: ###
 
@@ -22,30 +30,30 @@ include ../../build/config.gcc
 all: about help helpview printing test virtual widget zip
 
 about: 
-       (cd about && $(MAKE) all)
+       $(MAKE) -C about -f makefile.gcc $(MAKEARGS) all
 
 clean: 
        -if exist .\*.o del .\*.o
 
 help: 
-       (cd help && $(MAKE) all)
+       $(MAKE) -C help -f makefile.gcc $(MAKEARGS) all
 
 helpview: 
-       (cd helpview && $(MAKE) all)
+       $(MAKE) -C helpview -f makefile.gcc $(MAKEARGS) all
 
 printing: 
-       (cd printing && $(MAKE) all)
+       $(MAKE) -C printing -f makefile.gcc $(MAKEARGS) all
 
 test: 
-       (cd test && $(MAKE) all)
+       $(MAKE) -C test -f makefile.gcc $(MAKEARGS) all
 
 virtual: 
-       (cd virtual && $(MAKE) all)
+       $(MAKE) -C virtual -f makefile.gcc $(MAKEARGS) all
 
 widget: 
-       (cd widget && $(MAKE) all)
+       $(MAKE) -C widget -f makefile.gcc $(MAKEARGS) all
 
 zip: 
-       (cd zip && $(MAKE) all)
+       $(MAKE) -C zip -f makefile.gcc $(MAKEARGS) all
 
 .PHONY: all about clean help helpview printing test virtual widget zip