X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2910855229d9f8c537ceb4dfd7247656a3bf5f9f..e3f9e20cb15c62bd347a8e52d2d36529adbdb3d6:/src/makeva.env?ds=inline diff --git a/src/makeva.env b/src/makeva.env index eafd3a48a1..ba417e6e37 100644 --- a/src/makeva.env +++ b/src/makeva.env @@ -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,17 +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) +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\os2xpmd.lib $(WXDIR)\lib\os2tiffd.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 $(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 +EXTRALIBS=$(WXDIR)\lib\os2png.lib $(WXDIR)\lib\os2zlib.lib $(WXDIR)\lib\os2jpeg.lib $(WXDIR)\lib\os2tiff.lib LIBS=$(WXLIB) $(LINKLIBS) $(EXTRALIBS) !endif