summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-30 11:16:38 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-30 11:16:38 (GMT)
commita7bd1b8b54051af0e4a59ca36d6fa8cbbd221487 (patch)
treea31a0b702fd36400a5747c5cc738c2494de954bc
parent8fd84f53e70e83dd996314447bb0da5ec8cd5468 (diff)
downloadtk-a7bd1b8b54051af0e4a59ca36d6fa8cbbd221487.zip
tk-a7bd1b8b54051af0e4a59ca36d6fa8cbbd221487.tar.gz
tk-a7bd1b8b54051af0e4a59ca36d6fa8cbbd221487.tar.bz2
Don't limit Universal runtime support to 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 57e0453..c493d8b 100755
--- a/win/configure
+++ b/win/configure
@@ -3828,7 +3828,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"
;;
*)
@@ -3873,7 +3873,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"
;;
*)