X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e12f91dc2b4488965b3ace8cd099371bbe11341f..1cf27c63497d5b4e435f90691ca83a0bb75a8426:/src/makevc.env diff --git a/src/makevc.env b/src/makevc.env index 9ce663d59e..454960f264 100644 --- a/src/makevc.env +++ b/src/makevc.env @@ -8,6 +8,7 @@ # !include +WXVERSION=21b9 WIN95=1 !if "$(WIN95)" == "0" @@ -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,19 +113,24 @@ 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 +!if "$(NEW_WXLIBNAME)" != "" +WXLIBNAME=$(NEW_WXLIBNAME) +!endif + !if "$(FINAL)" == "1" D=Release !else D=Debug -WXLIBNAME=$(WXLIBNAME)_d +LIBEXT=_d +WXLIBNAME=$(WXLIBNAME)$(LIBEXT) !endif !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"