X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a2c6ef8d186df490df28a694820a5e8afc4b5e8..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/makewat.env?ds=sidebyside diff --git a/src/makewat.env b/src/makewat.env index d52e0c2dac..b12d76e5d9 100644 --- a/src/makewat.env +++ b/src/makewat.env @@ -29,7 +29,7 @@ PRECOMP = /fh=$(WXDIR)\src\msw\watcom.pch !endif !ifeq WXDEBUG 1 -DEBUGFLAGS = /D__WXDEBUG__ +DEBUGFLAGS = /D__WXDEBUG__ /o1 DEBUGINFO = debug all !else DEBUGFLAGS = @@ -46,17 +46,19 @@ MODEL = # If you use win95, assumptions will be made about Win95 icon format etc. # so nt_win is probably better for simultaneous Win32s/Win95/NT operation. LINKOPTION = nt_win # win95 +WINVERFLAGS = /dWINVER=0x400 /d__WIN95__ BINDCOMMAND = wrc WATLIBDIR = $(WATCOMDIR)\lib386\nt MINDATA = MAXDATA = STACK = option stack=64k -EXTRALIBS = $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\png.lib $(WXDIR)\lib\xpm.lib & - $(WATLIBDIR)\odbc32.lib $(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib & - $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib $(WATLIBDIR)\uuid.lib -IFLAGS = -i=$(WXINC) -i=$(%watcom)\h;$(%watcom)\h\nt # -i=$(WXDIR)\include\wx\msw\gnuwin32 -RESFLAGS1 = -r -bt=nt /i$(WXDIR)\include -RESFLAGS2 = -R $(name) /i$(WXDIR)\include +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 & + $(WATLIBDIR)\comctl32.lib $(WATLIBDIR)\comdlg32.lib & + $(WATLIBDIR)\ole32.lib $(WATLIBDIR)\oleaut32.lib $(WATLIBDIR)\opengl32.lib & + $(WATLIBDIR)\uuid.lib $(WXDIR)\lib\watcom\odbc32.lib +IFLAGS = -i=$(WXDIR)\lib\msw -i=$(WXINC) -i=$(WXDIR)\contrib\include -i=$(%watcom)\h;$(%watcom)\h\nt;$(WXDIR)\src\regex;$(WXDIR)\src\png;$(WXDIR)\src\zlib;$(WXDIR)\src\jpeg;$(WXDIR)\src\tiff;$(WXDIR)\include\wx\msw\gnuwin32 +RESFLAGS1 = -r -bt=nt /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(WINVERFLAGS) +RESFLAGS2 = -R $(name) /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(WINVERFLAGS) # Here are some possible optimization flags: # /5r Pentium timings @@ -69,7 +71,10 @@ RESFLAGS2 = -R $(name) /i$(WXDIR)\include OPTFLAGS=/ox /5r # /d1 for line numbers only: anything else produces an enormous wx32.lib -CPPFLAGS = /bt=nt /w1 /DWIN32 /D__WIN32__ /D__WIN95__ /D__WINDOWS__ /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) /d1 $(DEBUGFLAGS) /d__WXMSW__ $(EXTRACPPFLAGS) # /d__WATCOMC__ +# +# NB: /bm switch is needed for thread-safe runtime, if you don't use +# wxThread you may remove it +CPPFLAGS = /bt=nt /w1 /DWIN32 /bm /zq $(OPTFLAGS) $(MODEL) $(PRECOMP) $(DEBUGFLAGS) /d__WXMSW__ $(WINVERFLAGS) $(EXTRACPPFLAGS) # /d__WATCOMC__ .cpp.obj: # $< # .AUTODEPEND *$(CCC) $(CPPFLAGS) $(IFLAGS) $<