diff options
| author | jan.nijtmans <jan.nijtmans@noemail.net> | 2015-08-20 14:14:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <jan.nijtmans@noemail.net> | 2015-08-20 14:14:56 (GMT) |
| commit | f7b49513fe205ec45c883924f2db1db8d3d98bf6 (patch) | |
| tree | 83ef73c694d672de3a86e1ded41abace94724f73 /win/rules.vc | |
| parent | e47d7449ac7fbc0d9d887c6d7a7dd5fed2b929a5 (diff) | |
| parent | 4d21c874348641291b7385324425cd3e80f41dd0 (diff) | |
| download | tk-f7b49513fe205ec45c883924f2db1db8d3d98bf6.zip tk-f7b49513fe205ec45c883924f2db1db8d3d98bf6.tar.gz tk-f7b49513fe205ec45c883924f2db1db8d3d98bf6.tar.bz2 | |
Fix [http://core.tcl.tk/tcl/info/00189c4afcb9e2586301d711f71383e48817a72d|00189c4afc]: Allow semi-static UCRT build on Windows with VC 14.0
FossilOrigin-Name: f37f9308c9973f2e35fb8d67183c85fc7619843c
Diffstat (limited to 'win/rules.vc')
| -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 0d8cd6b..b2d92b7 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -223,6 +223,7 @@ LOIMPACT = 0 TCL_USE_STATIC_PACKAGES = 0
USE_THREAD_ALLOC = 1
UNCHECKED = 0
+UCRT = 0
!else
!if [nmakehlp -f $(OPTS) "static"]
!message *** Doing static
@@ -302,6 +303,12 @@ UNCHECKED = 1 UNCHECKED = 0
!endif
!endif
+!if [nmakehlp -f $(OPTS) "ucrt"] && $(VCVERSION) >= 1900
+!message *** Doing UCRT
+UCRT = 1
+!else
+UCRT = 0
+!endif
#----------------------------------------------------------
# Figure-out how to name our intermediate and output directories.
|