fixed

[wxWidgets.git] / src / makevc.env

diff --git a/src/makevc.env b/src/makevc.env
index 9ce663d59e5e163a8a001701d0a38523c1e607cf..88fd65a0048996ea770511d2ff076c706f93c707 100644 (file)
--- 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 <ntwin32.mak>
 
+WXVERSION=21_11
 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"
@@ -144,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"