X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/205b0c9c6aa69c02a7774846e677910bf1609a53..28999ba6310e9c110a963223fd38e1f340e60568:/src/makewat.env?ds=sidebyside diff --git a/src/makewat.env b/src/makewat.env index 24acfc30ac..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: @@ -109,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 @@ -138,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 & @@ -151,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 @@ -171,4 +174,5 @@ LDFLAGS = option eliminate, vfremoval defaulttarget: all .SYMBOLIC erasepch: .SYMBOLIC - -erase $(OUTPUTDIR)watcom.pch + -erase $(OUTPUTDIR)\watcom.pch +