X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f0a56ab0c38aac05101593488c7e0972c36c38b7..137c8bde085d6d5b7c459902d2ea1a198ab48765:/src/makeva.env diff --git a/src/makeva.env b/src/makeva.env index 976e9eb3d8..ba417e6e37 100644 --- a/src/makeva.env +++ b/src/makeva.env @@ -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 -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 +LINK=icc +RC=rc ##################################################################### # These are the possible DLL/non-DLL usages: @@ -31,9 +37,9 @@ EXTRAINC=$(WXDIR)\src\png #-------------------------------------------------------------------- # 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 # @@ -85,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 @@ -95,20 +101,34 @@ WXLIBNAME=$(NEW_WXLIBNAME) !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 -D=Debug +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) -LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\jpeg.lib 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) -LINKFLAGS=$(LINK_DEBUG_FLAGS) $(OS2LINKFLAGS) $(EXTRALNKFLAGS) +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 @@ -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) -LINKFLAGS=$(LINK_DEBUG_FLAGS) $(OS2LINKFLAGS) $(EXTRALNKFLAGS) +LINKFLAGS=$(OS2LINKFLAGS) $(LINK_DEBUG_FLAGS) $(EXTRALNKFLAGS) !endif DUMMYOBJ=$(WXDIR)\src\os2\$D\$(DUMMY).obj