diff options
| author | apnadkarni <apnadkarni@noemail.net> | 2017-09-19 12:50:25 (GMT) |
|---|---|---|
| committer | apnadkarni <apnadkarni@noemail.net> | 2017-09-19 12:50:25 (GMT) |
| commit | d11ca55a5da225caeae2994a440fa84cfd6e6873 (patch) | |
| tree | 0592562fda1abc6ac8353b8f04cec9a39704336a /win | |
| parent | 129b797e8ac4f7354206e2827c1175f5242034d1 (diff) | |
| download | tcl-d11ca55a5da225caeae2994a440fa84cfd6e6873.zip tcl-d11ca55a5da225caeae2994a440fa84cfd6e6873.tar.gz tcl-d11ca55a5da225caeae2994a440fa84cfd6e6873.tar.bz2 | |
Fix mapping of VCVERSION to VCVER. The simplistic calculation no longer
holds for new versions of the compiler. Instead directly use the internal
compiler version for these.
FossilOrigin-Name: b564ced4b61b3acb12a5d3fe710358204e6bba3a405d8991a744044952dc7e50
Diffstat (limited to 'win')
| -rw-r--r-- | win/rules.vc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/win/rules.vc b/win/rules.vc index 3f3d077..bca052b 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -68,11 +68,18 @@ VCVER=0 && ![echo $(_HASH)endif >> vercl.x] \
&& ![cl -nologo -TC -P vercl.x $(ERRNULL)]
!include vercl.i
+!if $(VCVERSION) < 1900
!if ![echo VCVER= ^\> vercl.vc] \
&& ![set /a $(VCVERSION) / 100 - 6 >> vercl.vc]
!include vercl.vc
!endif
+!else
+# The simple calculation above does not apply to new Visual Studio releases
+# Keep the compiler version in its native form.
+VCVER = $(VCVERSION)
+!endif
!endif
+
!if ![del $(ERRNUL) /q/f vercl.x vercl.i vercl.vc]
!endif
|