DrawLine normalized; wxStaticBitmap fixed for Dialog Editor

[wxWidgets.git] / src / makeva.env

diff --git a/src/makeva.env b/src/makeva.env
index 3045386dfd1746dd771bbf573b41e651c3f03111..d15808f6c2e7af1b8b17f9dd7484804abee7dea7 100644 (file)
--- a/src/makeva.env
+++ b/src/makeva.env
@@ -14,15 +14,20 @@ SRCSUFF=cpp
 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=j:\dev\Wx2\wxwindows
+# Set an environment variable, WXWIN, to your WXWIN directory
+WXDIR=$(WXWIN)
+
+# Set to where your UPM and LAN libs are
+UPMLIB=D:\MUGLIB
+NETLIB=D:\IBMLAN\NETSRC\LIB
 
 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:
@@ -95,9 +100,9 @@ WXLIBNAME=$(NEW_WXLIBNAME)
 !endif
 
 !if "$(FINAL)" == "1"
-D=Release
+D=RelseOS2
 !else
-D=Debug
+D=DebugOS2
 !endif
 
 WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib
@@ -108,7 +113,9 @@ D=$(D)DLL
 
 
 INC=-I$(WXINC) -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/zlib -I$(EXTRAINC)
-LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\jpeg.lib
+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=
@@ -142,7 +149,7 @@ 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)
-LINKFLAGS=$(LINK_DEBUG_FLAGS) $(OS2LINKFLAGS) $(EXTRALNKFLAGS)
+LINKFLAGS=$(OS2LINKFLAGS) $(LINK_DEBUG_FLAGS) $(EXTRALNKFLAGS)
 DUMMY=dummy
 
 !else
@@ -158,7 +165,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)
-LINKFLAGS=$(LINK_DEBUG_FLAGS) $(OS2LINKFLAGS) $(EXTRALNKFLAGS)
+LINKFLAGS=$(OS2LINKFLAGS) $(LINK_DEBUG_FLAGS) $(EXTRALNKFLAGS)
 !endif
 
 DUMMYOBJ=$(WXDIR)\src\os2\$D\$(DUMMY).obj