X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf09fab3b67a32a827a22c4dd9ccab20353f4eea..4b2424bcadbc87babd3367d243b957e49333eeae:/src/makeva.env?ds=sidebyside diff --git a/src/makeva.env b/src/makeva.env index 094df2e927..eafd3a48a1 100644 --- a/src/makeva.env +++ b/src/makeva.env @@ -19,9 +19,9 @@ OS2LIBFLAGS=/NOL /NOE WXDIR=$(WXWIN) # Set to where your UPM and LAN libs are -UPMLIB=C:\MUGLIB -NETLIB=C:\IBMLAN\NETSRC\LIB -TCPIP=D:\TOOLKIT\LIB +UPMLIB=C:\OS2TK45\LIB +NETLIB=C:\OS2TK45\LIB +TCPIP=C:\OS2TK45\LIB WXSRC=$(WXDIR)\src\os2 WXINC=$(WXDIR)\include @@ -116,13 +116,16 @@ D=DebugOS2 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib -INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(EXTRAINC) -!if "$(WXMAKINGDLL)" == "1" -LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.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" || "$(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