reversed change

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

diff --git a/samples/html/makefile.wat b/samples/html/makefile.wat
index fb1ae6cf7d586c711f61e0a0ae7a1cc302e489f8..1b3651e19b77c972fe64cd94b98d6afe665ad7fb 100644 (file)
--- a/samples/html/makefile.wat
+++ b/samples/html/makefile.wat
@@ -4,7 +4,7 @@
 #     Do not modify, all changes will be overwritten!
 # =========================================================================
 
-!include ../../build/config.wat
+!include ../../build/msw/config.wat
 
 # -------------------------------------------------------------------------
 # Do not modify the rest of this file!
@@ -30,7 +30,14 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Variables: ###
 
-
+MAKEARGS = CPPFLAGS="$(CPPFLAGS)" DEBUG_FLAG="$(DEBUG_FLAG)" &
+       LDFLAGS="$(LDFLAGS)" 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)" WXUNIV="$(WXUNIV)" &
+       RUNTIME_LIBS="$(RUNTIME_LIBS)" CXX="$(CXX)" CFG="$(CFG)" CFLAGS="$(CFLAGS)" &
+       SHARED="$(SHARED)" USE_ODBC="$(USE_ODBC)" USE_OPENGL="$(USE_OPENGL)"
 
 
 ### Targets: ###
@@ -39,7 +46,7 @@ all : .SYMBOLIC about help helpview printing test virtual widget zip
 
 about : .SYMBOLIC 
        cd about
-       wmake $(__MAKEOPTS__) all
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
 clean : .SYMBOLIC 
@@ -50,35 +57,35 @@ clean : .SYMBOLIC
 
 help : .SYMBOLIC 
        cd help
-       wmake $(__MAKEOPTS__) all
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
 helpview : .SYMBOLIC 
        cd helpview
-       wmake $(__MAKEOPTS__) all
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
 printing : .SYMBOLIC 
        cd printing
-       wmake $(__MAKEOPTS__) all
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
 test : .SYMBOLIC 
        cd test
-       wmake $(__MAKEOPTS__) all
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
 virtual : .SYMBOLIC 
        cd virtual
-       wmake $(__MAKEOPTS__) all
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
 widget : .SYMBOLIC 
        cd widget
-       wmake $(__MAKEOPTS__) all
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
 zip : .SYMBOLIC 
        cd zip
-       wmake $(__MAKEOPTS__) all
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)