Set the version number to use for the DLL in WXVERSION

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@3266 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/makevc.env b/src/makevc.env
index d73db5b206f1d38a66cc9423cc4e0ad6c8f3ddb6..601688d4175e9c578c941b2f9255a75a9449d16b 100644 (file)
--- a/src/makevc.env
+++ b/src/makevc.env
@@ -8,6 +8,7 @@
 #
 !include <ntwin32.mak>
 
 #
 !include <ntwin32.mak>
 

+WXVERSION=21b8

 WIN95=1
 
 !if "$(WIN95)" == "0"
 WIN95=1
 
 !if "$(WIN95)" == "0"


@@ -55,9 +56,9 @@ WXBASESRC=$(WXDIR)\src\common
 #--------------------------------------------------------------------
 # Normal application    -            -           -            wx.lib
 #
 #--------------------------------------------------------------------
 # 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
 #
 #
 # 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),
 
 # 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"
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"

-WXLIBNAME=wx200
+WXLIBNAME=wx$(WXVERSION)

 !else
 WXLIBNAME=wx
 !endif
 !else
 WXLIBNAME=wx
 !endif


@@ -128,7 +129,8 @@ WXLIBNAME=$(NEW_WXLIBNAME)
 D=Release
 !else
 D=Debug
 D=Release
 !else
 D=Debug

-WXLIBNAME=$(WXLIBNAME)_d
+LIBEXT=_d
+WXLIBNAME=$(WXLIBNAME)$(LIBEXT)

 !endif
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"
 !endif
 
 !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"