Vadim, please check this, I think it's what you meant

[wxWidgets.git] / src / makeva.env

diff --git a/src/makeva.env b/src/makeva.env
index f82e994c3a76253e4d0700ad071caca0b0874fbb..eafd3a48a13334f365a9c66daac9448cfd5258db 100644 (file)
--- a/src/makeva.env
+++ b/src/makeva.env
@@ -1,7 +1,7 @@
 #
 # File:    Makeva.env
 #
 # File:    Makeva.env

-# Author:      Ulrich Leodolter
-# Created:     Wed May 17 08:36:42 1995
+# Author:  David Webster
+# Created: Wed Apr 17 08:36:42 1999

 # Updated:
 #
 # VisualAge C++ V3.0 makefile include file
 # Updated:
 #
 # VisualAge C++ V3.0 makefile include file


@@ -14,15 +14,21 @@ SRCSUFF=cpp
 OS2FLAGS=/c /W3 /D__VISAGECPP__ /Ss /Q /N100
 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
 OS2LIBFLAGS=/NOL /NOE
 OS2FLAGS=/c /W3 /D__VISAGECPP__ /Ss /Q /N100
 OS2LINKFLAGS=/BASE:0x00010000 /PMTYPE:PM /NOE /NOD /ALIGN:16
 OS2LIBFLAGS=/NOL /NOE

-OS2LIBS=CPPOM30.lib CPPOOC3.LIB OS2386.LIB

 
 

-# Change this to your WXWIN directory
-WXDIR=h:\dev\Wx2\wxwindows
+# 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
 EXTRAINC=$(WXDIR)\src\png
 
 WXSRC=$(WXDIR)\src\os2
 WXINC=$(WXDIR)\include
 WXBASESRC=$(WXDIR)\src\common
 EXTRAINC=$(WXDIR)\src\png

+LINK=icc
+RC=rc

 
 #####################################################################
 # These are the possible DLL/non-DLL usages:
 
 #####################################################################
 # These are the possible DLL/non-DLL usages:


@@ -31,9 +37,9 @@ EXTRAINC=$(WXDIR)\src\png
 #--------------------------------------------------------------------
 # Normal application    -            -           -            wx.lib
 #
 #--------------------------------------------------------------------
 # Normal application    -            -           -            wx.lib
 #

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

 #
 #

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

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


@@ -85,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=wx200
+WXLIBNAME=wx23

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


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

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

 !else
 !else

-D=Debug
+D=DebugOS2
+!endif

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

 
 MAKEPRECOMP=/FiWX/WXPREC.H
 OPTIONS=
 
 MAKEPRECOMP=/FiWX/WXPREC.H
 OPTIONS=


@@ -142,12 +162,17 @@ MAKEPRECOMP=/Fi$(PCH)
 CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXPM__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) $(OVERRIDEFLAGS)
 # If you don't include wxprec.h, use CPPFLAGS2
 CPPFLAGS2=$(OS2FLAGS) $(DEBUG_FLAGS) /D__WXPM__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS)
 CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXPM__ $(INC) $(OPT) $(EXTRADLLFLAGS)  $(CRTFLAG) $(OVERRIDEFLAGS)
 # If you don't include wxprec.h, use CPPFLAGS2
 CPPFLAGS2=$(OS2FLAGS) $(DEBUG_FLAGS) /D__WXPM__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS)

-LINKFLAGS=$(LINK_DEBUG_FLAGS) $(OS2LINKFLAGS) $(EXTRALNKFLAGS)
+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


@@ -158,7 +183,7 @@ DUMMY=dummy
 PRECOMP=/SiWX/WXPREC.H
 CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXPM__ $(INC) $(OPT) $(CRTFLAG) $(EXTRADLLFLAGS)
 CPPFLAGS2=$(OS2FLAGS) $(DEBUG_FLAGS) /D__WXPM__ $(INC) $(EXTRAFLAGS) $(OPT) $(CRTFLAG) $(EXTRADLLFLAGS)
 PRECOMP=/SiWX/WXPREC.H
 CPPFLAGS=$(OS2FLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXPM__ $(INC) $(OPT) $(CRTFLAG) $(EXTRADLLFLAGS)
 CPPFLAGS2=$(OS2FLAGS) $(DEBUG_FLAGS) /D__WXPM__ $(INC) $(EXTRAFLAGS) $(OPT) $(CRTFLAG) $(EXTRADLLFLAGS)

-LINKFLAGS=$(LINK_DEBUG_FLAGS) $(OS2LINKFLAGS) $(EXTRALNKFLAGS)
+LINKFLAGS=$(OS2LINKFLAGS) $(LINK_DEBUG_FLAGS) $(EXTRALNKFLAGS)

 !endif
 
 DUMMYOBJ=$(WXDIR)\src\os2\$D\$(DUMMY).obj
 !endif
 
 DUMMYOBJ=$(WXDIR)\src\os2\$D\$(DUMMY).obj