non-PCH build fix (according to Tinderbox).

[wxWidgets.git] / src / makeva.env

diff --git a/src/makeva.env b/src/makeva.env
index e0652412dcdb5dde992c9b9d3afd6f2f07916eb7..ba417e6e378e2573d1c6363680269a757f1de0af 100644 (file)
--- a/src/makeva.env
+++ b/src/makeva.env
@@ -19,8 +19,8 @@ OS2LIBFLAGS=/NOL /NOE
 WXDIR=$(WXWIN)
 
 # Set to where your UPM and LAN libs are
-UPMLIB=C:\OS2TK45
-NETLIB=C:\OS2TK45
+UPMLIB=C:\OS2TK45\LIB
+NETLIB=C:\OS2TK45\LIB
 TCPIP=C:\OS2TK45\LIB
 
 WXSRC=$(WXDIR)\src\os2
@@ -37,9 +37,9 @@ RC=rc
 #--------------------------------------------------------------------
 # Normal application    -            -           -            wx.lib
 #
-# wxWin as DLL          Defined      -           Defined      wx23.lib
+# wxWin as DLL          Defined      -           Defined      wx25.lib
 #
-# App using wxWin DLL   -            Defined     -            wx23.lib
+# App using wxWin DLL   -            Defined     -            wx25.lib
 #
 # App built as one DLL  Defined      -           -            wx.lib
 #
@@ -91,7 +91,7 @@ DLL=0
 # wx200 (DLL release), wx200_d (DLL debug)
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
-WXLIBNAME=wx23
+WXLIBNAME=wx25
 !else
 WXLIBNAME=wx
 !endif
@@ -116,14 +116,17 @@ D=DebugOS2
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
-INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/xpm -I$(WXDIR)/src/tiff -I$(WXDIR)/src/png -I$(EXTRAINC)
-!if "$(WXMAKINGDLL)" == "1"
-LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB
-EXTRALIBS=$(WXDIR)\lib\os2pngd.lib $(WXDIR)\lib\os2zlibd.lib $(WXDIR)\lib\os2jpegd.lib $(WXDIR)\lib\os2xpmd.lib $(WXDIR)\lib\os2tiffd.lib
+INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(WXDIR)/src/tiff -I$(WXDIR)/src/png -I$(EXTRAINC)
+!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
+LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB $(TCPIP)\TCPIP32.LIB $(TCPIP)\R0LIB32.LIB
+EXTRALIBS=$(WXDIR)\lib\os2pngd.lib $(WXDIR)\lib\os2zlibd.lib $(WXDIR)\lib\os2jpegd.lib $(WXDIR)\lib\os2tiffd.lib
+!if "$(WXUSINGDLL)" == "1"
+EXTRALIBS=$(EXTRALIBS) $(WXLIB)
+!endif
 LIBS=$(LINKLIBS) $(EXTRALIBS)
 !else
-LINKLIBS=CPPOM30.LIB CPPOOC3.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB
-EXTRALIBS=$(WXDIR)\lib\os2png.lib $(WXDIR)\lib\os2zlib.lib $(WXDIR)\lib\os2jpeg.lib $(WXDIR)\lib\os2xpm.lib $(WXDIR)\lib\os2tiff.lib
+LINKLIBS=CPPOM30.LIB CPPOOC3.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB $(TCPIP)\TCPIP32.LIB $(TCPIP)\R0LIB32.LIB
+EXTRALIBS=$(WXDIR)\lib\os2png.lib $(WXDIR)\lib\os2zlib.lib $(WXDIR)\lib\os2jpeg.lib $(WXDIR)\lib\os2tiff.lib
 LIBS=$(WXLIB) $(LINKLIBS) $(EXTRALIBS)
 !endif