summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-30 11:17:41 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-30 11:17:41 (GMT)
commit6b610ff3829db4457144d118910552aab7338ec7 (patch)
tree975f84112242e5579e2fc53d01333ad75bed8122
parent9c35ad5d2bea5b5ae634bc96bedc74867dc4c9cc (diff)
parenta7bd1b8b54051af0e4a59ca36d6fa8cbbd221487 (diff)
downloadtk-6b610ff3829db4457144d118910552aab7338ec7.zip
tk-6b610ff3829db4457144d118910552aab7338ec7.tar.gz
tk-6b610ff3829db4457144d118910552aab7338ec7.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 1959f8f..5840966 100755
--- a/win/configure
+++ b/win/configure
@@ -3907,7 +3907,7 @@ echo "${ECHO_T}using shared flags" >&6
LIBRARIES="\${SHARED_LIBRARIES}"
EXESUFFIX="\${DBGX}.exe"
case "x`echo \${VisualStudioVersion}`" in
- x14*)
+ x1[4-9]*)
lflags="${lflags} -nodefaultlib:libucrt.lib"
;;
*)
@@ -3955,7 +3955,7 @@ echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6
LIBS="netapi32.lib kernel32.lib 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 7d4acdb..8e3b13f 100644
--- a/win/tcl.m4
+++ b/win/tcl.m4
@@ -792,7 +792,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
LIBRARIES="\${SHARED_LIBRARIES}"
EXESUFFIX="\${DBGX}.exe"
case "x`echo \${VisualStudioVersion}`" in
- x14*)
+ x1[4-9]*)
lflags="${lflags} -nodefaultlib:libucrt.lib"
;;
*)
@@ -837,7 +837,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [
LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib"
case "x`echo \${VisualStudioVersion}`" in
- x14*)
+ x1[4-9]*)
LIBS="$LIBS ucrt.lib"
;;
*)