X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/10e8e34f71eba02901f27fa40d4edae9f67145d1..0c3d85e6efc0d9ee4ec2abbd7eacbe80478cfb83:/src/makewat.env

diff --git a/src/makewat.env b/src/makewat.env
index 2c60ca773f..2b0e89eee3 100644
--- a/src/makewat.env
+++ b/src/makewat.env
@@ -3,6 +3,7 @@
 # Purpose:      Watcom environments for wxWindows makefiles.
 # Author:       Julian Smart and others
 # Version:      $Id$
+# Changelist:	2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
 ###############################################################################
 
 # The following environment variables must be set:
@@ -33,8 +34,6 @@ WATCOM_SUFFIX=_w
 WINVERFLAGS = /dWINVER=0x400 /d_WIN32_IE=0x0300
 
 # optimize for space/time: /os or /ot
-#
-# NB: at least with OpenWatcom 1.0 using /ox leads to buggy code, don't use it
 !ifeq FINAL 1
 OPTFLAGS=/oails /5r
 !else
@@ -111,11 +110,12 @@ LIBPAGESIZE=/p=2048
 # set OUTPUTDIR to the directory to be used for the .obj files created during
 # the build (under $WXWIN)
 !ifndef OUTPUTDIR
-OUTPUTDIR=$(WXDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom\
+OUTPUTDIR=$(WXDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom
+# no trailing slash for win98
 !endif
 
 !ifneq NOPRECOMP 1
-PRECOMP     = /fh=$(OUTPUTDIR)watcom.pch
+PRECOMP     = /fh=$(OUTPUTDIR)\watcom.pch
 !endif
 
 # the basename of the library
@@ -140,6 +140,7 @@ LIBS        = $(WXDIR)\lib\$(LIBNAME).lib &
 !endif
               $(WATLIBDIR)\comctl32.lib &
               $(WATLIBDIR)\comdlg32.lib &
+              $(WATLIBDIR)\wsock32.lib &
               $(WATLIBDIR)\odbc32.lib &
               $(WATLIBDIR)\ole32.lib &
               $(WATLIBDIR)\oleaut32.lib &
@@ -153,7 +154,7 @@ RESFLAGS    = -q -r -bt=nt /i$(WXDIR)\include /i$(WXDIR)\contrib\include $(WINVE
 
 # NB: /bm switch is needed for thread-safe runtime, if you don't use
 #     wxThread you may remove it
-CPPFLAGS = /dWIN32 /bm /fo=$(OUTPUTDIR) /fr /zq $(IFLAGS) $(OPTFLAGS) $(WINVERFLAGS) $(EXTRACPPFLAGS)
+CPPFLAGS = /dWIN32 /bm /fo=$(OUTPUTDIR)\ /fr /zq $(IFLAGS) $(OPTFLAGS) $(WINVERFLAGS) $(EXTRACPPFLAGS)
 !ifeq wxUSE_GUI 0
 CPPFLAGS += /dwxUSE_GUI=0
 !endif
@@ -173,4 +174,5 @@ LDFLAGS = option eliminate, vfremoval
 defaulttarget: all .SYMBOLIC
 
 erasepch:   .SYMBOLIC
-    -erase $(OUTPUTDIR)watcom.pch
+    -erase $(OUTPUTDIR)\watcom.pch
+