Removed a space (oh, dear, it looks like a joke

[wxWidgets.git] / src / makeva.env

diff --git a/src/makeva.env b/src/makeva.env
index 481f40869bd8b87818b6be6224b4de83e9cb0632..626f35dccbeefce3c79d87e4bc194c086b742cbe 100644 (file)
--- a/src/makeva.env
+++ b/src/makeva.env
@@ -15,8 +15,12 @@ OS2FLAGS=/c /W3 /D__VISAGECPP__ /Ss /Q /N100
 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
 OS2LIBFLAGS=/NOL /NOE
 
-# Change this to your WXWIN directory
-WXDIR=j:\dev\Wx2\wxwindows
+# Set an environment variable, WXWIN, to your WXWIN directory
+WXDIR=$(WXWIN)
+
+# Set to where your UPM and LAN libs are
+UPMLIB=D:\MUGLIB
+NETLIB=D:\IBMLAN\NETSRC\LIB
 
 WXSRC=$(WXDIR)\src\os2
 WXINC=$(WXDIR)\include
@@ -32,9 +36,9 @@ RC=rc
 #--------------------------------------------------------------------
 # Normal application    -            -           -            wx.lib
 #
-# wxWin as DLL          Defined      -           Defined      wx200.lib
+# wxWin as DLL          Defined      -           Defined      wx214.lib
 #
-# App using wxWin DLL   -            Defined     -            wx200.lib
+# App using wxWin DLL   -            Defined     -            wx214.lib
 #
 # App built as one DLL  Defined      -           -            wx.lib
 #
@@ -86,7 +90,7 @@ DLL=0
 # wx200 (DLL release), wx200_d (DLL debug)
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
-WXLIBNAME=wx200
+WXLIBNAME=wx214
 !else
 WXLIBNAME=wx
 !endif
@@ -109,7 +113,7 @@ D=$(D)DLL
 
 
 INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(EXTRAINC)
-LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB UPM32.LIB NETAPI32.LIB
+LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB
 EXTRALIBS=$(WXDIR)\lib\os2png.lib $(WXDIR)\lib\os2zlib.lib $(WXDIR)\lib\os2jpeg.lib $(WXDIR)\lib\os2xpm.lib
 LIBS=$(WXLIB) $(EXTRALIBS)