diff options
| author | nijtmans@users.sourceforge.net <jan.nijtmans> | 2015-10-06 15:04:42 (GMT) |
|---|---|---|
| committer | nijtmans@users.sourceforge.net <jan.nijtmans> | 2015-10-06 15:04:42 (GMT) |
| commit | 4123a5f65bb9e72bca776701cc607fee53d38636 (patch) | |
| tree | b7d2fe003ea8c9f3e2e11a1cead2d37800e737b3 | |
| parent | 645ba702fac47391e1f21e7166cc207f9db255b0 (diff) | |
| download | tk-4123a5f65bb9e72bca776701cc607fee53d38636.zip tk-4123a5f65bb9e72bca776701cc607fee53d38636.tar.gz tk-4123a5f65bb9e72bca776701cc607fee53d38636.tar.bz2 | |
Link with userenv.lib, because it is now needed by Tcl.
| -rwxr-xr-x | win/configure | 4 | ||||
| -rw-r--r-- | win/makefile.vc | 2 | ||||
| -rw-r--r-- | win/tcl.m4 | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/win/configure b/win/configure index 8671721..64aea44 100755 --- a/win/configure +++ b/win/configure @@ -3736,7 +3736,7 @@ echo $ECHO_N "checking compiler flags... $ECHO_C" >&6 if test "${GCC}" = "yes" ; then SHLIB_LD="" SHLIB_LD_LIBS='${LIBS}' - LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32" + LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -luserenv -lws2_32" # mingw needs to link ole32 and oleaut32 for [send], but MSVC doesn't LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid -lole32 -loleaut32" STLIB_LD='${AR} cr' @@ -3952,7 +3952,7 @@ echo "${ECHO_T} Using 64-bit $MACHINE mode" >&6 fi fi - LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib" + LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib userenv.lib ws2_32.lib" case "x`echo \${VisualStudioVersion}`" in x1[4-9]*) diff --git a/win/makefile.vc b/win/makefile.vc index 1b55cdf..ae43eb6 100644 --- a/win/makefile.vc +++ b/win/makefile.vc @@ -523,7 +523,7 @@ guilflags = $(lflags) -subsystem:windows tcllibs = $(TCLSTUBLIB) $(TCLIMPLIB)
-baselibs = netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib
+baselibs = netapi32.lib kernel32.lib user32.lib advapi32.lib userenv.lib ws2_32.lib
# Avoid 'unresolved external symbol __security_cookie' errors.
# c.f. http://support.microsoft.com/?id=894573
!if "$(MACHINE)" == "IA64" || "$(MACHINE)" == "AMD64"
@@ -673,7 +673,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ if test "${GCC}" = "yes" ; then SHLIB_LD="" SHLIB_LD_LIBS='${LIBS}' - LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32" + LIBS="-lnetapi32 -lkernel32 -luser32 -ladvapi32 -luserenv -lws2_32" # mingw needs to link ole32 and oleaut32 for [send], but MSVC doesn't LIBS_GUI="-lgdi32 -lcomdlg32 -limm32 -lcomctl32 -lshell32 -luuid -lole32 -loleaut32" STLIB_LD='${AR} cr' @@ -834,7 +834,7 @@ AC_DEFUN([SC_CONFIG_CFLAGS], [ fi fi - LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib ws2_32.lib" + LIBS="netapi32.lib kernel32.lib user32.lib advapi32.lib userenv.lib ws2_32.lib" case "x`echo \${VisualStudioVersion}`" in x1[[4-9]]*) |