summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-30 11:12:45 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-30 11:12:45 (GMT)
commit744b806d3d369ad409cd210021e51016abafabda (patch)
treefcaa083a592c9ab8f16e4c87fc5705d027a4b099
parent151bf2620529364506e857f49d66f6cac2335180 (diff)
parent5572aa0ec790cb0075eca068cf30ae366abb7f4c (diff)
downloadtcl-744b806d3d369ad409cd210021e51016abafabda.zip
tcl-744b806d3d369ad409cd210021e51016abafabda.tar.gz
tcl-744b806d3d369ad409cd210021e51016abafabda.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 cc2eb9b..c510b71 100755
--- a/win/configure
+++ b/win/configure
@@ -3758,7 +3758,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"
;;
*)
@@ -3806,7 +3806,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"
;;
*)