krb5 commit: Link correct VS2015 C libraries for debug builds

Greg Hudson ghudson at mit.edu
Fri May 13 14:17:22 EDT 2016


https://github.com/krb5/krb5/commit/e92dde11a96c23fd68df846260203de4cd09efb4
commit e92dde11a96c23fd68df846260203de4cd09efb4
Author: Greg Hudson <ghudson at mit.edu>
Date:   Sun May 8 11:11:22 2016 -0400

    Link correct VS2015 C libraries for debug builds
    
    When building with VS2015 and NODEBUG is not set, link with the
    debugging versions of ucrt.lib and vcruntime.lib.  Based on work by
    Chris Kingsley.
    
    ticket: 8412 (new)

 src/lib/Makefile.in              |    4 ++++
 src/windows/kfwlogon/Makefile.in |    4 ++++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 178954d..8fbc50a 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -53,7 +53,11 @@ clean-windows::
 
 ##WIN32##!if defined(VISUALSTUDIOVERSION)
 ##WIN32##!if $(VISUALSTUDIOVERSION:.=) >= 140
+##WIN32##!ifdef NODEBUG
 ##WIN32##WINCRTEXTRA = ucrt.lib vcruntime.lib
+##WIN32##!else
+##WIN32##WINCRTEXTRA = ucrtd.lib vcruntimed.lib
+##WIN32##!endif
 ##WIN32##!endif
 ##WIN32##!endif
 ##WIN32##WINLIBS = kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib \
diff --git a/src/windows/kfwlogon/Makefile.in b/src/windows/kfwlogon/Makefile.in
index 50c8bca..ab7c3ba 100644
--- a/src/windows/kfwlogon/Makefile.in
+++ b/src/windows/kfwlogon/Makefile.in
@@ -9,7 +9,11 @@ PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR)
 
 !if defined(VISUALSTUDIOVERSION)
 !if $(VISUALSTUDIOVERSION:.=) >= 140
+!ifdef NODEBUG
 WINCRTEXTRA = ucrt.lib vcruntime.lib
+!else
+WINCRTEXTRA = ucrtd.lib vcruntimed.lib
+!endif
 !endif
 !endif
 SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib userenv.lib $(WINCRTEXTRA)


More information about the cvs-krb5 mailing list