Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use version.mak on the 2.4 branch too

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@19326 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2003-02-26 05:26:20 +00:00
parent c1d0d47326
commit ac878b40d5
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/makevc.env
View File

@@ -12,7 +12,9 @@
RM= erase RM= erase
!endif !endif
WXVERSION=240 # read version numbers
!include "version.mak"
WXVERSION=$(wxMAJOR_VERSION)$(wxMINOR_VERSION)$(wxRELEASE_NUMBER_IFUNSTABLE)
# WIN95 means "all systems newer than Win95", i.e. Win9x and NT 4+ # WIN95 means "all systems newer than Win95", i.e. Win9x and NT 4+
WIN95=1 WIN95=1

9
src/version.mak
View File

@@ -10,7 +10,7 @@
############################################################################## ##############################################################################
wxMAJOR_VERSION=2 wxMAJOR_VERSION=2
wxMINOR_VERSION=5 wxMINOR_VERSION=4
wxRELEASE_NUMBER=0 wxRELEASE_NUMBER=0
# release number if used in the DLL file names only for the unstable branch as # release number if used in the DLL file names only for the unstable branch as
@@ -19,6 +19,7 @@ wxRELEASE_NUMBER=0
# impossible to use them without recompiling the applications (which is the # impossible to use them without recompiling the applications (which is the
# whole goal of keeping them backwards compatible in the first place) # whole goal of keeping them backwards compatible in the first place)
# #
# as 2.5 is an unstable branch, wxRELEASE_NUMBER_IFUNSTABLE should be set # As 2.4 is a stable branch, wxRELEASE_NUMBER_IFUNSTABLE should be empty
# (but when we go to 2.6, it should become empty) # so we end up with DLLs with only "24" in the name. Unstable branches
wxRELEASE_NUMBER_IFUNSTABLE=$(wxRELEASE_NUMBER) # should set it to $wxRELEASE_NUMBER
wxRELEASE_NUMBER_IFUNSTABLE=