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
This commit is contained in:
Robin Dunn
1999-08-04 16:33:27 +00:00
parent ccf0b1d76c
commit cb1b6606ab

View File

@@ -8,6 +8,7 @@
# #
!include <ntwin32.mak> !include <ntwin32.mak>
WXVERSION=21b8
WIN95=1 WIN95=1
!if "$(WIN95)" == "0" !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 # 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), # 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 !else
WXLIBNAME=wx WXLIBNAME=wx
!endif !endif
@@ -128,7 +129,8 @@ WXLIBNAME=$(NEW_WXLIBNAME)
D=Release D=Release
!else !else
D=Debug D=Debug
WXLIBNAME=$(WXLIBNAME)_d LIBEXT=_d
WXLIBNAME=$(WXLIBNAME)$(LIBEXT)
!endif !endif
!if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1" !if "$(WXMAKINGDLL)" == "1" || "$(WXUSINGDLL)" == "1"