Applied patch sent to me for xpmdecod.cpp/VC++ compilation, and changed

[wxWidgets.git] / src / makeva.env

diff --git a/src/makeva.env b/src/makeva.env
index 626f35dccbeefce3c79d87e4bc194c086b742cbe..eafd3a48a13334f365a9c66daac9448cfd5258db 100644 (file)
--- a/src/makeva.env
+++ b/src/makeva.env
@@ -19,8 +19,9 @@ OS2LIBFLAGS=/NOL /NOE
 WXDIR=$(WXWIN)
 
 # Set to where your UPM and LAN libs are
 WXDIR=$(WXWIN)
 
 # Set to where your UPM and LAN libs are

-UPMLIB=D:\MUGLIB
-NETLIB=D:\IBMLAN\NETSRC\LIB
+UPMLIB=C:\OS2TK45\LIB
+NETLIB=C:\OS2TK45\LIB
+TCPIP=C:\OS2TK45\LIB

 
 WXSRC=$(WXDIR)\src\os2
 WXINC=$(WXDIR)\include
 
 WXSRC=$(WXDIR)\src\os2
 WXINC=$(WXDIR)\include


@@ -36,9 +37,9 @@ RC=rc
 #--------------------------------------------------------------------
 # Normal application    -            -           -            wx.lib
 #
 #--------------------------------------------------------------------
 # Normal application    -            -           -            wx.lib
 #

-# wxWin as DLL          Defined      -           Defined      wx214.lib
+# wxWin as DLL          Defined      -           Defined      wx23.lib

 #
 #

-# App using wxWin DLL   -            Defined     -            wx214.lib
+# App using wxWin DLL   -            Defined     -            wx23.lib

 #
 # App built as one DLL  Defined      -           -            wx.lib
 #
 #
 # App built as one DLL  Defined      -           -            wx.lib
 #


@@ -90,7 +91,7 @@ DLL=0
 # wx200 (DLL release), wx200_d (DLL debug)
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 # wx200 (DLL release), wx200_d (DLL debug)
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"

-WXLIBNAME=wx214
+WXLIBNAME=wx23

 !else
 WXLIBNAME=wx
 !endif
 !else
 WXLIBNAME=wx
 !endif


@@ -100,22 +101,34 @@ WXLIBNAME=$(NEW_WXLIBNAME)
 !endif
 
 !if "$(FINAL)" == "1"
 !endif
 
 !if "$(FINAL)" == "1"

+!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
+D=RelseOS2DLL
+!else

 D=RelseOS2
 D=RelseOS2

+!endif
+!else
+!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
+D=DebugOS2DLL

 !else
 D=DebugOS2
 !endif
 !else
 D=DebugOS2
 !endif

+!endif

 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
 
 
 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"
 !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\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 $(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
 !endif

-
-
-INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(EXTRAINC)
-LINKLIBS=CPPOM30I.LIB CPPOOC3I.LIB OS2386.LIB $(UPMLIB)\UPM32.LIB $(NETLIB)\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=
 
 MAKEPRECOMP=/FiWX/WXPREC.H
 OPTIONS=


@@ -150,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 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
 DUMMY=dummy

+!endif

 
 !else
 
 
 !else
 

-!if "$(WXMAKINGDLL)" == "1"
+!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"

 PCH=$(WXLIBNAME).pch
 DUMMY=dummydll
 !else
 PCH=$(WXLIBNAME).pch
 DUMMY=dummydll
 !else