X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57e3f9d9cc8be13a9794ed84f55650b6a7940518..cc6dd35581586950ebcf7ef4493166001ec5a645:/src/makeva.env

diff --git a/src/makeva.env b/src/makeva.env
index 58008266d4..ba417e6e37 100644
--- a/src/makeva.env
+++ b/src/makeva.env
@@ -18,6 +18,11 @@ OS2LIBFLAGS=/NOL /NOE
 # Set an environment variable, WXWIN, to your WXWIN directory
 WXDIR=$(WXWIN)
 
+# Set to where your UPM and LAN libs are
+UPMLIB=C:\OS2TK45\LIB
+NETLIB=C:\OS2TK45\LIB
+TCPIP=C:\OS2TK45\LIB
+
 WXSRC=$(WXDIR)\src\os2
 WXINC=$(WXDIR)\include
 WXBASESRC=$(WXDIR)\src\common
@@ -32,9 +37,9 @@ RC=rc
 #--------------------------------------------------------------------
 # Normal application    -            -           -            wx.lib
 #
-# wxWin as DLL          Defined      -           Defined      wx200.lib
+# wxWin as DLL          Defined      -           Defined      wx25.lib
 #
-# App using wxWin DLL   -            Defined     -            wx200.lib
+# App using wxWin DLL   -            Defined     -            wx25.lib
 #
 # App built as one DLL  Defined      -           -            wx.lib
 #
@@ -86,7 +91,7 @@ DLL=0
 # wx200 (DLL release), wx200_d (DLL debug)
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
-WXLIBNAME=wx200
+WXLIBNAME=wx25
 !else
 WXLIBNAME=wx
 !endif
@@ -96,22 +101,34 @@ WXLIBNAME=$(NEW_WXLIBNAME)
 !endif
 
 !if "$(FINAL)" == "1"
+!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
+D=RelseOS2DLL
+!else
 D=RelseOS2
+!endif
+!else
+!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
+D=DebugOS2DLL
 !else
 D=DebugOS2
 !endif
+!endif
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).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"
-D=$(D)DLL
+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 $(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
-
-
-INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(EXTRAINC)
-LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB UPM32.LIB NETAPI32.LIB
-EXTRALIBS=$(WXDIR)\lib\os2png.lib $(WXDIR)\lib\os2zlib.lib $(WXDIR)\lib\os2jpeg.lib $(WXDIR)\lib\os2xpm.lib
-LIBS=$(WXLIB) $(EXTRALIBS)
 
 MAKEPRECOMP=/FiWX/WXPREC.H
 OPTIONS=
@@ -146,11 +163,16 @@ CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXPM__ $(INC) $
 # If you don't include wxprec.h, use CPPFLAGS2
 CPPFLAGS2=$(OS2FLAGS) $(DEBUG_FLAGS) /D__WXPM__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS)
 LINKFLAGS=$(OS2LINKFLAGS) $(LINK_DEBUG_FLAGS) $(EXTRALNKFLAGS)
+
+!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
+DUMMY=dummydll
+!else
 DUMMY=dummy
+!endif
 
 !else
 
-!if "$(WXMAKINGDLL)" == "1"
+!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 PCH=$(WXLIBNAME).pch
 DUMMY=dummydll
 !else