X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a701b7f87ed0042dd44253b13252cd0fdb98e070..42ef83fa71e14e4fcbb537dd0da7bd9ef9701f49:/src/makevc.env?ds=inline diff --git a/src/makevc.env b/src/makevc.env index 1b61693440..ed4835ee07 100644 --- a/src/makevc.env +++ b/src/makevc.env @@ -8,11 +8,15 @@ # !include +# read version numbers +!include "version.mak" +WXVERSION=$(wxMAJOR_VERSION)$(wxMINOR_VERSION)$(wxRELEASE_NUMBER_IFUNSTABLE) + !if "$(RM)" == "" RM= erase !endif -WXVERSION=23_0 +# WIN95 means "all systems newer than Win95", i.e. Win9x and NT 4+ WIN95=1 !if "$(WIN95)" == "0" @@ -22,9 +26,9 @@ WIN95=1 APPVER=3.50 WINVERSION=-DWINVER=0x0350 # Generic WIN32 !else -APPVER=3.50 # 4.0 +APPVER=4.0 # This means 'enable Windows 95 features' (in wxWindows and in VC++ 4.0). -WINVERSION=-DWINVER=0x0400 /D__WIN95__ +WINVERSION=-DWINVER=0x0400 !endif # On Alpha machines, change to CPU=ALPHA @@ -36,13 +40,16 @@ SRCSUFF=cpp WAITFLAG=/w -# If you set wxUSE_IOSTREAMH to 0, remove -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally -#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) -BASELINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:console,$(APPVER) -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 wsock32.lib # libci.lib # libci.lib required for VC++ 4.2 +# If you set wxUSE_IOSTREAMH to 0, remove +# -Dtry=__try -Dexcept=__except -Dleave=__leave -Dfinally=__finally +#WINFLAGS=-c -W3 -DCRTAPI1=_cdecl -DCRTAPI2=_cdecl -nologo -D_X86_=1 -DWIN32 -D__WIN32__ $(WINVERSION) -DSTRICT +WINFLAGS=-c -W3 -nologo -DWIN32 -D_WINDOWS $(WINVERSION) -DSTRICT +WINLINKFLAGS=-nologo -machine:$(CPU) -subsystem:windows,$(APPVER) +BASELINKFLAGS=-nologo -machine:$(CPU) -subsystem:console,$(APPVER) +WINLIBS=kernel32.lib user32.lib gdi32.lib comdlg32.lib winspool.lib winmm.lib \ + shell32.lib oldnames.lib comctl32.lib odbc32.lib ole32.lib oleaut32.lib \ + uuid.lib rpcrt4.lib advapi32.lib wsock32.lib \ + # libci.lib # libci.lib required for VC++ 4.2 # Set a WXWIN environment variable be the path to your WXWIN directory WXDIR=$(WXWIN) @@ -99,9 +106,24 @@ EXTRADLLFLAGS= EXTRADLLFLAGS=$(EXTRADLLFLAGS) /DNOMAIN !endif +!ifndef UNICODE +UNICODE=0 +!endif + +!ifndef MSLU +MSLU=0 +!endif + !ifndef FINAL FINAL=0 -DEBUG=1 +!endif + +!ifndef DEBUGINFO +!if "$(FINAL)" == "0" +DEBUGINFO=1 +!else +DEBUGINFO=0 +!endif !endif !ifndef DLL @@ -113,78 +135,122 @@ 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) +# This sets 'D' to a suitable directory name: [Base](Debug|Release|Hybrid)[Dll] +# for this kind of build, and WXLIBNAME to one of wx(msw|base)[u][d] (static), +# wx(msw|base)$(WXVERSION)[u][d] (DLL) -!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" -WXLIBNAME=wx$(WXVERSION) -!else -WXLIBNAME=wx +!if "$(UNICODE)" == "1" +_WXLIB_SUFFIX=u +_WXINC_SUFFIX=u +_WXDIR_UNICODESUFFIX=Unicode !endif -!if "$(NEW_WXLIBNAME)" != "" -WXLIBNAME=$(NEW_WXLIBNAME) +!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" +_WXLIB_VERSION=$(WXVERSION) +_WXDIR_DLLSUFFIX=Dll +_WXINC_DLLSUFFIX=dll +!else +_WXLIB_VERSION= +_WXDIR_DLLSUFFIX= +_WXINC_DLLSUFFIX= !endif !if "$(FINAL)" == "1" -D=Release +_WXDIR_BUILD=Release +LIBEXT= +# no _WXDIR_SUFFIX !else if "$(FINAL)" == "hybrid" -D=Hybrid +_WXDIR_BUILD=Hybrid LIBEXT=h -WXLIBNAME=$(WXLIBNAME)$(LIBEXT) !else guilibsdll= oldnames.lib kernel32.lib \ ws2_32.lib mswsock.lib advapi32.lib user32.lib \ gdi32.lib comdlg32.lib winspool.lib -D=Debug +_WXDIR_BUILD=Debug LIBEXT=d -WXLIBNAME=$(WXLIBNAME)$(LIBEXT) !endif !if "$(wxUSE_GUI)" == "0" -WXLIBNAME=wxBase -D=Base$(D) -WXLIBNAME=$(WXLIBNAME)$(LIBEXT) +_WXDIR_PREFIX=Base +_WXLIB_NAME=wxbase +_WXINC_BUILD=base +!else +_WXDIR_PREFIX= +_WXLIB_NAME=wxmsw +_WXINC_BUILD=msw +!endif + +!if "$(UNICODE)" == "1" +UNIFLAGS=-DUNICODE -D_UNICODE -DwxUSE_UNICODE=1 +!endif + +!if "$(wxUSE_GUI)" == "0" +UNIFLAGS=$(UNIFLAGS) -DwxUSE_GUI=0 !endif !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" D=$(D)DLL +INCEXT=dll$(INCEXT) +!endif + +D=$(_WXDIR_PREFIX)$(_WXDIR_BUILD)$(_WXDIR_UNICODESUFFIX)$(_WXDIR_DLLSUFFIX) +WXLIBNAME=$(_WXLIB_NAME)$(_WXLIB_VERSION)$(_WXLIB_SUFFIX)$(LIBEXT) +INCEXT=$(_WXINC_SUFFIX)$(LIBEXT) + +!if "$(NEW_WXLIBNAME)" != "" +WXLIBNAME=$(NEW_WXLIBNAME) +!endif + +#---------------------------------------------------------------------- +# MSLU == Microsoft Layer for Unicode +# See MSDN or the Platform SDK docs for details +!if "$(MSLU)" == "1" +MSLU_FLAGS=/nod:kernel32.lib /nod:advapi32.lib /nod:user32.lib /nod:gdi32.lib /nod:shell32.lib /nod:comdlg32.lib /nod:version.lib /nod:mpr.lib /nod:rasapi32.lib /nod:winmm.lib /nod:winspool.lib /nod:vfw32.lib /nod:secur32.lib /nod:oleacc.lib /nod:oledlg.lib /nod:sensapi.lib +MSLU_LIBS=$(MSLU_FLAGS) unicows.lib !endif WXLIB=$(WXDIR)\lib\$(WXLIBNAME).lib -INC=$(EXTRAINC) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff +INC=$(EXTRAINC) -I$(WXDIR)/lib/$(_WXINC_BUILD)$(_WXINC_DLLSUFFIX)$(_WXINC_SUFFIX)$(LIBEXT) -I$(WXINC) -I$(WXDIR)/contrib/include -I$(WXDIR)/src/regex -I$(WXDIR)/src/png -I$(WXDIR)/src/zlib -I$(WXDIR)/src/jpeg -I$(WXDIR)/src/tiff !if "$(WXUSINGDLL)" == "1" || "$(wxUSE_GUI)" == "0" -LIBS = $(EXTRALIBS) $(WXLIB) $(WINLIBS) +LIBS = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib !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 +LIBS = $(MSLU_LIBS) $(EXTRALIBS) $(WXLIB) $(WINLIBS) $(WXDIR)\lib\regex$(LIBEXT).lib $(WXDIR)\lib\png$(LIBEXT).lib $(WXDIR)\lib\zlib$(LIBEXT).lib $(WXDIR)\lib\jpeg$(LIBEXT).lib $(WXDIR)\lib\tiff$(LIBEXT).lib !endif -MAKEPRECOMP=/YcWX/WXPREC.H OPTIONS= +!if "$(DEBUGINFO)" == "0" + +!if "$(FINAL)" == "hybrid" +OPT = /Ox /Gy +!else +# /O1 - smallest code +# /O2 - fastest code +OPT = /O1 # /O2 # /Od +!endif + +LINK_DEBUG_FLAGS=/RELEASE + +!else +OPT = /Od /Gy /Zi +LINK_DEBUG_FLAGS=-debug:full -debugtype:cv +!endif + !if "$(FINAL)" == "0" -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 +DEBUG_FLAGS= /D__WXDEBUG__ # /DDEBUG=1 # /FR _CRTFLAG=/MDd !else if "$(FINAL)" == "hybrid" -OPT = /Od /Gy -DEBUG_FLAGS= /Zi /D__WXDEBUG__ /D__NO_VC_CRTDBG__ -LINK_DEBUG_FLAGS=-debug:full -debugtype:cv +DEBUG_FLAGS= /D__WXDEBUG__ /D__NO_VC_CRTDBG__ _CRTFLAG=/MD !else -# /O1 - smallest code -# /O2 - fastest code -OPT = /O1 # /O2 # /Od DEBUG_FLAGS= -LINK_DEBUG_FLAGS=/RELEASE _CRTFLAG=/MD + !endif @@ -192,53 +258,59 @@ _CRTFLAG=/MD CRTFLAG=$(_CRTFLAG) !endif -!if "$(DLL)" == "0" - !if "$(NOPCH)" == "1" + PCH= PRECOMP= MAKEPRECOMP= + !else - + !if "$(wxUSE_GUI)" == "0" PCH=wxBase.pch !else -PCH=wxvc.pch +PCH=wxWindows.pch !endif - -PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\src\msw\$D\$(PCH) /Fd$(WXDIR)\src\msw\$D\vc60.pdb + +PRECOMP=/YuWX/WXPREC.H /Fp$(WXDIR)\$D\$(PCH) /Fd$(WXDIR)\lib\$(WXLIBNAME).pdb MAKEPRECOMP=/YcWX/WXPREC.H + !endif - +!if "$(DLL)" == "0" -CPPFLAGS=$(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) /D__WXMSW__ $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS) +CPPFLAGS=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) $(INC) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS) # If you don't include wxprec.h, use CPPFLAGS2 -CPPFLAGS2=$(WINFLAGS) $(DEBUG_FLAGS) /D__WXMSW__ $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) /D__WINDOWS__ /GX /DSTRICT $(OVERRIDEFLAGS) +CPPFLAGS2=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(INC) $(EXTRAFLAGS) $(OPT) $(EXTRADLLFLAGS) $(CRTFLAG) $(OVERRIDEFLAGS) + !if "$(wxUSE_GUI)" == "0" LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS) !else -LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -entry:WinMainCRTStartup +LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) !endif + DUMMY=dummy !else +CPPFLAGS= $(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(PRECOMP) $(EXTRAFLAGS) $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDLL +CPPFLAGS2=$(UNIFLAGS) $(WINFLAGS) $(DEBUG_FLAGS) $(EXTRAFLAGS) $(INC) $(OPT) /D_DLL $(CRTFLAG) $(EXTRADLLFLAGS) /D_WINDLL + +!if "$(wxUSE_GUI)" == "0" +LINKFLAGS=$(LINK_DEBUG_FLAGS) $(BASELINKFLAGS) -dll +!else +LINKFLAGS=$(LINK_DEBUG_FLAGS) $(WINLINKFLAGS) -dll +!endif + !if "$(WXMAKINGDLL)" == "1" -PCH=wxvc.pch DUMMY=dummydll !else -PCH=wxvc.pch DUMMY=dummy !endif -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\$D\$(DUMMY).obj +DUMMYOBJ=$(WXDIR)\$D\$(DUMMY).obj .c.obj: cl @<<