X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a4fe6524851ebeed1f6d24e8e3fa53b706479ff6..6e807169c4b63b29b42c36ae15141a31adb29204:/src/makevc.env diff --git a/src/makevc.env b/src/makevc.env index d73db5b206..eb7c71ff72 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=21_11 WIN95=1 !if "$(WIN95)" == "0" @@ -41,7 +42,7 @@ WINLINKFLAGS=/INCREMENTAL:NO /NOLOGO -machine:$(CPU) -subsystem:windows,$(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 -# Change this to your WXWIN directory +# Set a WXWIN environment variable be the path to your WXWIN directory WXDIR=$(WXWIN) WXSRC=$(WXDIR)\src\msw @@ -55,9 +56,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 # @@ -112,10 +113,10 @@ NOPCH=0 # This sets 'D' to a suitable directory name # for this kind of build, and WXLIBNAME to one of wx (static release), wx_d (static debug), -# wx200 (DLL release), wx200_d (DLL debug) +# wx$(WXVERSION) (DLL release), wx$(WXVERSION)_d (DLL debug) !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" -WXLIBNAME=wx200 +WXLIBNAME=wx$(WXVERSION) !else WXLIBNAME=wx !endif @@ -128,7 +129,8 @@ WXLIBNAME=$(NEW_WXLIBNAME) D=Release !else D=Debug -WXLIBNAME=$(WXLIBNAME)_d +LIBEXT=_d +WXLIBNAME=$(WXLIBNAME)$(LIBEXT) !endif !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" @@ -148,14 +150,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"