X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b75f580670355de5f6b054ac1c0b1ec83010e52..6433f6d3165a3f8633f42c59694a9104a7b37a93:/src/makeva.env?ds=sidebyside diff --git a/src/makeva.env b/src/makeva.env index b4dc4828fd..eafd3a48a1 100644 --- a/src/makeva.env +++ b/src/makeva.env @@ -118,14 +118,14 @@ 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" || "$(WXUSINGDLL)" == "1" -LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\NETAPI32.LIB $(TCPIP)\TCP32DLL.LIB $(TCPIP)\SO32DLL.LIB +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