summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-30 11:11:33 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-30 11:11:33 (GMT)
commit5572aa0ec790cb0075eca068cf30ae366abb7f4c (patch)
treee28b76092a6d2660ef324d8acb725d2b71b5a253
parenta2540e5ece3d78a4ea38164cdbcb92d6f0c769c3 (diff)
downloadtcl-5572aa0ec790cb0075eca068cf30ae366abb7f4c.zip
tcl-5572aa0ec790cb0075eca068cf30ae366abb7f4c.tar.gz
tcl-5572aa0ec790cb0075eca068cf30ae366abb7f4c.tar.bz2
Don't limit Universal runtime support VisualStudio version 14 only, future versions will probably have it as well.
-rwxr-xr-xwin/configure4
-rw-r--r--win/tcl.m44
2 files changed, 4 insertions, 4 deletions
diff --git a/win/configure b/win/configure
index f417981..1dcc9d2 100755
--- a/win/configure
+++ b/win/configure
@@ -3691,7 +3691,7 @@ echo "${ECHO_T}using shared flags" >&6
LIBRARIES="\${SHARED_LIBRARIES}"
SHLIB_LD_LIBS='${LIBS}'
case "x`echo \${VisualStudioVersion}`" in
- x14*)
+ x1[4-9]*)
lflags="${lflags} -nodefaultlib:libucrt.lib"
;;
*)
@@ -3736,7 +3736,7 @@ echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6
LIBS="user32.lib advapi32.lib ws2_32.lib"
case "x`echo \${VisualStudioVersion}`" in
- x14*)
+ x1[4-9]*)
LIBS="$LIBS ucrt.lib"
;;
*)
diff --git a/win/tcl.m4 b/win/tcl.m4
index 6f10a96..aa3c4b3 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -784,7 +784,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
LIBRARIES="\${SHARED_LIBRARIES}"
SHLIB_LD_LIBS='${LIBS}'
case "x`echo \${VisualStudioVersion}`" in
- x14*)
+ x1[4-9]*)
lflags="${lflags} -nodefaultlib:libucrt.lib"
;;
*)
@@ -826,7 +826,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
LIBS="user32.lib advapi32.lib ws2_32.lib"
case "x`echo \${VisualStudioVersion}`" in
- x14*)
+ x1[4-9]*)
LIBS="$LIBS ucrt.lib"
;;
*)