X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/227869da8d090e2364530dd310e2d63ad18edecf..1be06faf7318abf88a35b299b90ceb2a49c0353b:/src/makevc.env?ds=inline diff --git a/src/makevc.env b/src/makevc.env index 01d08574fd..1922707f70 100644 --- a/src/makevc.env +++ b/src/makevc.env @@ -1,5 +1,5 @@ # -# File: ntwxwin.env +# File: makevc.env # Author: Ulrich Leodolter # Created: Wed May 17 08:36:42 1995 # Updated: @@ -8,6 +8,7 @@ # !include +WXVERSION=22_0 WIN95=1 !if "$(WIN95)" == "0" @@ -29,16 +30,16 @@ CPU=i386 OBJSUFF=obj SRCSUFF=cpp +WAITFLAG=/w + # If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -WINFLAGS=-c -W3 -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION) -#WINLINKFLAGS=/NODEFAULTLIB /INCREMENTAL:NO /NOLOGO -align:0x1000 -machine:$(CPU) -subsystem:windows,$(APPVER) +#WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION) +WINFLAGS=-c -W3 -nologo -DWIN32 -D__WIN32__ -D_WINDOWS $(WINVERSION) WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(APPVER) -#WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib libc.lib oldnames.lib\ -# comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib # libci.lib # libci.lib required for VC++ 4.2 WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib shell32.lib oldnames.lib\ - comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib # libci.lib # libci.lib required for VC++ 4.2 + comctl32.lib ctl3d32.lib odbc32.lib ole32.lib oleaut32.lib uuid.lib rpcrt4.lib advapi32.lib wsock32.lib # libci.lib # libci.lib required for VC++ 4.2 -# Change this to your WXWIN directory +# Set a WXWIN environment variable be the path to your WXWIN directory WXDIR=$(WXWIN) WXSRC=$(WXDIR)\src\msw @@ -52,9 +53,9 @@ WXBASESRC=$(WXDIR)\src\common #-------------------------------------------------------------------- # Normal application - - - wx.lib # -# wxWin as DLL Defined - Defined wx200.lib +# wxWin as DLL Defined - Defined wx$(WXVERSION).lib # -# App using wxWin DLL - Defined - wx200.lib +# App using wxWin DLL - Defined - wx$(WXVERSION).lib # # App built as one DLL Defined - - wx.lib # @@ -77,12 +78,6 @@ WXBASESRC=$(WXDIR)\src\common #DLL=0 -!if "$(WXUSINGDLL)" == "1" || "$(WXMAKINGDLL)" == "1" -WXLIB=$(WXDIR)\lib\wx200.lib -!else -WXLIB=$(WXDIR)\lib\wx.lib -!endif - !if "$(WXUSINGDLL)" == "1" EXTRADLLFLAGS=/DWXUSINGDLL=1 !endif @@ -99,9 +94,6 @@ EXTRADLLFLAGS= EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN !endif -INC=-I$(WXINC) -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib $(EXTRAINC) -LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\winpng.lib $(WXDIR)\lib\zlib.lib $(WXDIR)\lib\xpm.lib - !ifndef FINAL FINAL=0 DEBUG=1 @@ -116,6 +108,45 @@ DLL=0 NOPCH=0 !endif +# This sets 'D' to a suitable directory name +# for this kind of build, and WXLIBNAME to one of wx (static release), wxd (static debug), +# wx$(WXVERSION) (DLL release), wx$(WXVERSION)d (DLL debug) + +!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" +WXLIBNAME=wx$(WXVERSION) +!else +WXLIBNAME=wx +!endif + +!if "$(NEW_WXLIBNAME)" != "" +WXLIBNAME=$(NEW_WXLIBNAME) +!endif + +!if "$(FINAL)" == "1" +D=Release +!else +guilibsdll= oldnames.lib kernel32.lib \ + ws2_32.lib mswsock.lib advapi32.lib user32.lib \ + gdi32.lib comdlg32.lib winspool.lib +D=Debug +LIBEXT=d +WXLIBNAME=$(WXLIBNAME)$(LIBEXT) +!endif + +!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" +D=$(D)DLL +!endif + +WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib + +INC=-I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff $(EXTRAINC) + +!if "$(WXUSINGDLL)" == "1" +LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) +!else +LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib $(WXDIR)\lib\xpm$(LIBEXT).lib +!endif + MAKEPRECOMP=/YcWX/WXPREC.H OPTIONS= @@ -124,14 +155,18 @@ OPT = /Od /Gy # ***N.B.*** to save space/time, comment out /FR to avoid browse info (.sbr files) being generated DEBUG_FLAGS= /Zi /D__WXDEBUG__ # /DDEBUG=1 # /FR LINK_DEBUG_FLAGS=-debug:full -debugtype:cv # /PDB:NONE -CRTFLAG=/MD +_CRTFLAG=/MDd !else # /O1 - smallest code # /O2 - fastest code OPT = /O1 # /O2 # /Od DEBUG_FLAGS= LINK_DEBUG_FLAGS=/RELEASE -CRTFLAG=/MD +_CRTFLAG=/MD +!endif + +!if "$(CRTFLAG)" == "" +CRTFLAG=$(_CRTFLAG) !endif !if "$(DLL)" == "0" @@ -141,8 +176,8 @@ PCH= PRECOMP= MAKEPRECOMP= !else -PCH=WX.PCH -PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb +PCH=wxvc.pch +PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$D\vc60.pdb MAKEPRECOMP=/YcWX/WXPREC.H !endif @@ -155,18 +190,33 @@ DUMMY=dummy !else !if "$(WXMAKINGDLL)" == "1" -PCH=WXDLL.PCH +PCH=wxvc.pch DUMMY=dummydll !else -PCH=WX.PCH +PCH=wxvc.pch DUMMY=dummy !endif -PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$(PCH) /Fd$(WXDIR)\lib\wx.pdb +PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDOWS /D__WINDOWS__ /D_WINDLL LINKFLAGS=$(LINK_DEBUG_FLAGS) -machine:i386 -subsystem:windows,$(APPVER) -dll # -entry:_DllMainCRTStartup$(DLLENTRY) !endif -DUMMYOBJ=$(WXDIR)\src\msw\$(DUMMY).obj +DUMMYOBJ=$(WXDIR)\src\msw\$D\$(DUMMY).obj + +.c.obj: + cl @<< +$(CPPFLAGS2) /Fo$@ /c $< +<< + +.cpp.obj: + cl @<< +$(CPPFLAGS2) /Fo$@ /c $< +<< + +{}.cpp{$D}.obj: + cl @<< +$(CPPFLAGS) /Fo$@ /c /Tp $< +<<