Applied patch [ 850594 ] wxFileName(_T("/fred")).GetFullPath() asserts

[wxWidgets.git] / utils / makefile.wat

diff --git a/utils/makefile.wat b/utils/makefile.wat
index 60963a52f250ffd6f036bf7707715e522c2cdea5..ce7eff3a86608a1838e71f8cd47dcd9507f09099 100644 (file)
--- a/utils/makefile.wat
+++ b/utils/makefile.wat
@@ -30,18 +30,19 @@ WATCOM_CWD = $+ $(%cdrive):$(%cwd) $-
 
 ### Variables: ###
 
-MAKEARGS = CPPFLAGS=$(CPPFLAGS) OFFICIAL_BUILD=$(OFFICIAL_BUILD) &
-       WXUNIV=$(WXUNIV) DEBUG_FLAG=$(DEBUG_FLAG) CFLAGS=$(CFLAGS) &
-       RUNTIME_LIBS=$(RUNTIME_LIBS) CXX=$(CXX) CFG=$(CFG) USE_GUI=$(USE_GUI) &
-       MONOLITHIC=$(MONOLITHIC) CXXFLAGS=$(CXXFLAGS) CC=$(CC) USE_HTML=$(USE_HTML) &
-       BUILD=$(BUILD) LDFLAGS=$(LDFLAGS) DEBUG_INFO=$(DEBUG_INFO) SHARED=$(SHARED) &
-       VENDOR=$(VENDOR) USE_OPENGL=$(USE_OPENGL) USE_ODBC=$(USE_ODBC) &
-       UNICODE=$(UNICODE)
+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: ###
 
-all : .SYMBOLIC tex2rtf helpgen
+all : .SYMBOLIC configtool emulator helpview tex2rtf helpgen
 
 clean : .SYMBOLIC 
        -if exist .\*.obj del .\*.obj
@@ -49,11 +50,26 @@ clean : .SYMBOLIC
        -if exist .\*.lbc del .\*.lbc
        -if exist .\*.ilk del .\*.ilk
 
+configtool : .SYMBOLIC 
+       cd configtool\src
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
+emulator : .SYMBOLIC 
+       cd emulator\src
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
 helpgen : .SYMBOLIC 
        cd HelpGen
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
        cd $(WATCOM_CWD)
 
+helpview : .SYMBOLIC 
+       cd helpview\src
+       wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all
+       cd $(WATCOM_CWD)
+
 tex2rtf : .SYMBOLIC 
        cd tex2rtf\src
        wmake $(__MAKEOPTS__) -f makefile.wat $(MAKEARGS) all