diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-08-20 14:14:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-08-20 14:14:56 (GMT) |
| commit | 3d7f0e8d7cfffce49958bacc775d06908a769dd6 (patch) | |
| tree | 83ef73c694d672de3a86e1ded41abace94724f73 /win/rules.vc | |
| parent | 4660929af627a46789752dc4856f013ed2b5653a (diff) | |
| parent | 1fd576b1cecb84450f2ae58edd48d66fe871c773 (diff) | |
| download | tk-3d7f0e8d7cfffce49958bacc775d06908a769dd6.zip tk-3d7f0e8d7cfffce49958bacc775d06908a769dd6.tar.gz tk-3d7f0e8d7cfffce49958bacc775d06908a769dd6.tar.bz2 | |
Fix [http://core.tcl.tk/tcl/info/00189c4afcb9e2586301d711f71383e48817a72d|00189c4afc]: Allow semi-static UCRT build on Windows with VC 14.0
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.
|