X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..88db66e3734d7dc8bdc965bd03e8512b64b8a48a:/src/makewat.env

diff --git a/src/makewat.env b/src/makewat.env
index c4281cc084..8a668d85b2 100644
--- a/src/makewat.env
+++ b/src/makewat.env
@@ -24,7 +24,7 @@ WXBASEINC = $(WXDIR)\include\base
 OBJSUFF=obj
 SRCSUFF=cpp
 
-DEBUG=0
+WXDEBUG=0
 
 !ifneq NOPRECOMP 1
 PRECOMP     = /fh=$(WXDIR)\src\msw\watcom.pch
@@ -54,8 +54,8 @@ RESFLAGS1   = -r -bt=windows /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa
 RESFLAGS2   = -R $(name) /i$(WXDIR)\include\msw /i$(WXDIR)\contrib\fafa
 DEBUGINFO   = debug all
 
-#CPPFLAGS    = /zw /w1 /zq /d2 /d__WIN386__ /zt4 $(MODEL) /d__WINDOWS__
-CPPFLAGS    = /zw /w1 /zq /d1 /d__WIN386__ $(MODEL) $(PRECOMP) /d__WINDOWS__ $(EXTRACPPFLAGS)
+#CPPFLAGS    = /zw /w1 /zq /d2 /d__WIN386__ /zt4 $(MODEL) /d__WXMSW__
+CPPFLAGS    = /zw /w1 /zq /d1 /d__WIN386__ $(MODEL) $(PRECOMP) /d__WXMSW__ $(EXTRACPPFLAGS)
 
 !endif
 #### END WIN386 MODE
@@ -88,8 +88,8 @@ DEBUGINFO   = debug all
 # or we get link failure (TEXT segment overflow). Is this OK for
 # 32-bit mode also? -- JACS
 # An alternative might be /zc (put string literals in code segment).
-#CPPFLAGS    = /zw /w1 /zq /d1 /zt4 $(MODEL) /d__WINDOWS__
-CPPFLAGS    = /zw /w2 /zq /d1 $(MODEL) $(PRECOMP) /d__WINDOWS__ $(EXTRACPPFLAGS)
+#CPPFLAGS    = /zw /w1 /zq /d1 /zt4 $(MODEL) /d__WXMSW__
+CPPFLAGS    = /zw /w2 /zq /d1 $(MODEL) $(PRECOMP) /d__WXMSW__ $(EXTRACPPFLAGS)
 
 !endif
 #### END WINDOWS MODE
@@ -127,10 +127,10 @@ DEBUGINFO   = debug all # Linking: comment out if operating in a non-debuggable
 # The Watcom-recommended flags for optimum Pentium speed are:
 # /oneatx /zp4 /5 /fpi87 /fp5
 
-OPTFLAGS=/ox /5r # /DDEBUG=1
+OPTFLAGS=/ox /5r # /DWXDEBUG=1
 
 # /d1 for line numbers only: anything else produces an enormous wx32.lib
-CPPFLAGS    = /bt=nt /w1 /D__WIN32__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 /d__WINDOWS__ $(EXTRACPPFLAGS)
+CPPFLAGS    = /bt=nt /w1 /D__WIN32__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 /d__WXMSW__ $(EXTRACPPFLAGS)
 
 !endif
 #### END NT MODE