diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-08-28 11:47:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2015-08-28 11:47:28 (GMT) |
| commit | c9a6593a17cf151dc2bd2aeb8e83eac17ef529f5 (patch) | |
| tree | 8b19b845d9b5911b28fc2cde6ca3ed391c20e18f /win/configure | |
| parent | 3d7f0e8d7cfffce49958bacc775d06908a769dd6 (diff) | |
| parent | 43fa4c24905499a1f9e52986e3bcc75e2ede53fb (diff) | |
| download | tk-c9a6593a17cf151dc2bd2aeb8e83eac17ef529f5.zip tk-c9a6593a17cf151dc2bd2aeb8e83eac17ef529f5.tar.gz tk-c9a6593a17cf151dc2bd2aeb8e83eac17ef529f5.tar.bz2 | |
Completing [http://core.tcl.tk/tcl/info/00189c4afcb9e2586301d711f71383e48817a72d|00189c4afc]: Allow semi-static UCRT build on Windows with VC 14.0. Now for the configure/makefile build.
Diffstat (limited to 'win/configure')
| -rwxr-xr-x | win/configure | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/win/configure b/win/configure index 8b7ae07..1959f8f 100755 --- a/win/configure +++ b/win/configure @@ -3906,6 +3906,13 @@ echo "${ECHO_T}using shared flags" >&6 # Add SHLIB_LD_LIBS to the Make rule, not here. LIBRARIES="\${SHARED_LIBRARIES}" EXESUFFIX="\${DBGX}.exe" + case "x`echo \${VisualStudioVersion}`" in + x14*) + lflags="${lflags} -nodefaultlib:libucrt.lib" + ;; + *) + ;; + esac fi MAKE_DLL="\${SHLIB_LD} \$(LDFLAGS) -out:\$@" # DLLSUFFIX is separate because it is the building block for @@ -3946,6 +3953,15 @@ echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6 fi LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib" + + case "x`echo \${VisualStudioVersion}`" in + x14*) + LIBS="$LIBS ucrt.lib" + ;; + *) + ;; + esac + if test "$do64bit" != "no" ; then # The space-based-path will work for the Makefile, but will # not work if AC_TRY_COMPILE is called. TEA has the @@ -4020,7 +4036,7 @@ fi CFLAGS_DEBUG="-nologo -Zi -Od ${runtime}d" # Do not use -O2 for Win64 - this has proved buggy in code gen. CFLAGS_OPTIMIZE="-nologo -O1 ${runtime}" - lflags="-nologo -MACHINE:${MACHINE} -LIBPATH:\"${MSSDK}/Lib/${MACHINE}\"" + lflags="${lflags} -nologo -MACHINE:${MACHINE} -LIBPATH:\"${MSSDK}/Lib/${MACHINE}\"" LINKBIN="\"${PATH64}/link.exe\"" # Avoid 'unresolved external symbol __security_cookie' errors. # c.f. http://support.microsoft.com/?id=894573 @@ -4032,7 +4048,7 @@ fi CFLAGS_DEBUG="-nologo -Z7 -Od -WX ${runtime}d" # -O2 - create fast code (/Og /Oi /Ot /Oy /Ob2 /Gs /GF /Gy) CFLAGS_OPTIMIZE="-nologo -O2 ${runtime}" - lflags="-nologo" + lflags="${lflags} -nologo" LINKBIN="link" fi |