X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63d5e8389867eb7296d27a674b767d14b34d9c13..2fe212b0336512aac9eace69fab09ce856b0bf4b:/src/makeva.env?ds=sidebyside

diff --git a/src/makeva.env b/src/makeva.env
index e0652412dc..eafd3a48a1 100644
--- 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
@@ -117,12 +117,15 @@ 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
+!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\os2xpmd.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
+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\os2xpm.lib $(WXDIR)\lib\os2tiff.lib
 LIBS=$(WXLIB) $(LINKLIBS) $(EXTRALIBS)
 !endif