diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-09-30 13:57:25 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-09-30 13:57:25 (GMT) |
| commit | 10cd3c906d001142e4ca7dc8619952fe8bc93533 (patch) | |
| tree | 7c06784e71a482e48931dcea44fe253ede2a96f1 /win | |
| parent | 0fca37f8030617b728b1087e41f3bda4b243d003 (diff) | |
| parent | 56a99d9dd9b526a8ec479310bc9fd08420d4672b (diff) | |
| download | tcl-10cd3c906d001142e4ca7dc8619952fe8bc93533.zip tcl-10cd3c906d001142e4ca7dc8619952fe8bc93533.tar.gz tcl-10cd3c906d001142e4ca7dc8619952fe8bc93533.tar.bz2 | |
merge trunk
Diffstat (limited to 'win')
| -rwxr-xr-x | win/configure | 4 | ||||
| -rw-r--r-- | win/tcl.m4 | 4 |
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" ;; *) @@ -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" ;; *) |