[29041] in CVS-changelog-for-Kerberos-V5
krb5 commit: Link ucrt.lib and vcruntime.lib for VS2015
daemon@ATHENA.MIT.EDU (Greg Hudson)
Thu Aug 27 13:17:22 2015
Date: Thu, 27 Aug 2015 13:17:19 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201508271717.t7RHHJc7001158@drugstore.mit.edu>
To: cvs-krb5@mit.edu
Reply-To: krbdev@mit.edu
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: cvs-krb5-bounces@mit.edu
https://github.com/krb5/krb5/commit/4552159e97007a45370dd49fa6b9fb963bb7d160
commit 4552159e97007a45370dd49fa6b9fb963bb7d160
Author: Thomas Sondergaard <thomas.sondergaard@karoshealth.com>
Date: Tue Aug 11 08:52:20 2015 +0200
Link ucrt.lib and vcruntime.lib for VS2015
The Visual C++ runtime libraries have been rearranged in VS2015:
http://blogs.msdn.com/b/vcblog/archive/2015/03/03/introducing-the-universal-crt.aspx
[ghudson@mit.edu: wrap a long line in lib/Makefile.in; edit commit
summary]
ticket: 8231
src/lib/Makefile.in | 6 +++++-
src/windows/kfwlogon/Makefile.in | 5 ++++-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 4dde514..e5ea67f 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -51,8 +51,12 @@ clean-windows::
##WIN32##KRB5RC = krb5.rc
##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc
+##WIN32##!if defined(VISUALSTUDIOVERSION) && $(VISUALSTUDIOVERSION:.=) >= 140
+##WIN32##WINCRTEXTRA = ucrt.lib vcruntime.lib
+##WIN32##!endif
##WIN32##WINLIBS = kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib \
-##WIN32## version.lib secur32.lib advapi32.lib gdi32.lib delayimp.lib
+##WIN32## version.lib secur32.lib advapi32.lib gdi32.lib delayimp.lib \
+##WIN32## $(WINCRTEXTRA)
##WIN32##WINDLLFLAGS = $(DLL_LINKOPTS) -base:0x1c000000 /DELAYLOAD:secur32.dll \
##WIN32## /DELAYLOAD:advapi32.dll /DELAY:UNLOAD /DELAY:NOBIND
diff --git a/src/windows/kfwlogon/Makefile.in b/src/windows/kfwlogon/Makefile.in
index 1da3058..da7f1d3 100644
--- a/src/windows/kfwlogon/Makefile.in
+++ b/src/windows/kfwlogon/Makefile.in
@@ -7,7 +7,10 @@ DEFINES = -DNO_KRB4
LOCALINCLUDES = -I$(BUILDTOP) -I$(BUILDTOP)\include -I$(BUILDTOP)\windows\include
PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR)
-SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib userenv.lib
+!if defined(VISUALSTUDIOVERSION) && $(VISUALSTUDIOVERSION:.=) >= 140
+WINCRTEXTRA = ucrt.lib vcruntime.lib
+!endif
+SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib userenv.lib $(WINCRTEXTRA)
VERSIONRC = $(BUILDTOP)\windows\version.rc
RCFLAGS=$(CPPFLAGS) -I$(top_srcdir) -D_WIN32 -DRES_ONLY
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
