diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-09-30 14:46:48 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-09-30 14:46:48 (GMT) |
| commit | 009394840a93391fb574b4cbc7a9eb114ee3da7b (patch) | |
| tree | e54a25a1760e53ba8d6d8b8049addba8621c8b41 /win | |
| parent | ee2ce93b2a9f94bf0fb220792ca75b6bdce7478c (diff) | |
| parent | a7bd1b8b54051af0e4a59ca36d6fa8cbbd221487 (diff) | |
| download | tk-009394840a93391fb574b4cbc7a9eb114ee3da7b.zip tk-009394840a93391fb574b4cbc7a9eb114ee3da7b.tar.gz tk-009394840a93391fb574b4cbc7a9eb114ee3da7b.tar.bz2 | |
merge core-8-5-branch. tip_437
This is the TIP #437 implementation being voted on.
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 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" ;; *) @@ -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" ;; *) |