Fixed GetShapeList and similar methods to use OOR.

[wxWidgets.git] / src / mgl / makewat.env

diff --git a/src/mgl/makewat.env b/src/mgl/makewat.env
index 775c5470a2dbb4c05265bdeb2a36d582633a7e81..c80a02fb60acc2f62c6d97e7c5e99d508b9499d4 100644 (file)
--- a/src/mgl/makewat.env
+++ b/src/mgl/makewat.env
@@ -35,16 +35,16 @@ WXDEBUG=0
 PRECOMP     = /fh=$(WXDIR)\src\mgl\watcom.pch
 !endif
 
-!ifeq WXDEBUG 1
-DEBUGFLAGS     = /D__WXDEBUG__ /o1
+!ifeq FINAL 0
+DEBUGFLAGS     = /D__WXDEBUG__ /d2
 DEBUGINFO   = debug all
+ARCHINCDIR=$(WXDIR)\lib\mgld
 !else
 DEBUGFLAGS     =
 DEBUGINFO   =
+ARCHINCDIR=$(WXDIR)\lib\mgl
 !endif
 
-RC = wrc
-
 LEVEL       = 386
 CCC         = wpp$(LEVEL)
 CC         =  wcc$(LEVEL)
@@ -56,12 +56,10 @@ WATLIBDIR   = $(WATCOMDIR)\lib386\dos
 MINDATA     =
 MAXDATA     =
 STACK       = option stack=200k
-LIBS   = $(WXDIR)\lib\wxmgl.lib $(WXDIR)\lib\regex.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\jpeg.lib &
+LIBS   = $(WXDIR)\lib\wx.lib $(WXDIR)\lib\regex.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\tiff.lib $(WXDIR)\lib\jpeg.lib &
       $(MGLLIBDIR)\dos4gw\pm.lib $(MGLLIBDIR)\mgl.lib $(MGLLIBDIR)\mglcpp.lib  
-IFLAGS      = -i=$(WXDIR)\lib\mgl;$(WXINC) -i=$(WXDIR)\contrib\include -i=$(%watcom)\h;$(%watcom)\h\dos;$(WXDIR)\src\regex;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff
+IFLAGS      = -i=$(ARCHINCDIR);$(WXINC) -i=$(WXDIR)\contrib\include -i=$(%watcom)\h;$(%watcom)\h\dos;$(WXDIR)\src\regex;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff
 ;$(MGLROOT)\include
-RESFLAGS1   = -r -bt=nt /i$(WXDIR)\include /i$(WXDIR)\contrib\include
-RESFLAGS2   = -R $(name) /i$(WXDIR)\include /i$(WXDIR)\contrib\include
 
 # Here are some possible optimization flags:
 # /5r  Pentium timings