[29040] in CVS-changelog-for-Kerberos-V5
krb5 commit: Pick MFC version based on VisualStudioVersion
daemon@ATHENA.MIT.EDU (Greg Hudson)
Thu Aug 27 13:17:22 2015
Date: Thu, 27 Aug 2015 13:17:18 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201508271717.t7RHHIDB001136@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/705c2a4f21f64e0ee5be10eeffbc8c78c27a518d
commit 705c2a4f21f64e0ee5be10eeffbc8c78c27a518d
Author: Thomas Sondergaard <thomas.sondergaard@karoshealth.com>
Date: Tue Aug 11 08:31:53 2015 +0200
Pick MFC version based on VisualStudioVersion
Rather than hardcode support for VS2010 and VS2012, assume that the
right MFC version can be obtained by removing the "." in the
VisualStudioVersion variable. This is true for VS2010, VS2012,
VS2013, and VS2015 at least. If VisualStudioVersion it is not set,
fall back to using MFC100(D) as before.
ticket: 8231
src/windows/leash/Makefile.in | 15 ++++++---------
1 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in
index f3337f4..83e2b62 100644
--- a/src/windows/leash/Makefile.in
+++ b/src/windows/leash/Makefile.in
@@ -14,19 +14,16 @@ AFS_INCLUDES=
AFS_LIBS=
!endif
-# Need MFC version 11 for VS 2012; older VS get MFC version 10
-!if defined(VISUALSTUDIOVERSION) && "$(VISUALSTUDIOVERSION)" == "11.0"
-!if defined(NODEBUG)
-MFCLIB=MFC110.LIB
+!if defined(VISUALSTUDIOVERSION)
+MFC_VERSION=$(VISUALSTUDIOVERSION:.=)
!else
-MFCLIB=MFC110D.LIB
+MFC_VERSION=100
!endif
-!else
+
!if defined(NODEBUG)
-MFCLIB=MFC100.LIB
+MFCLIB=MFC$(MFC_VERSION).LIB
!else
-MFCLIB=MFC100D.LIB
-!endif
+MFCLIB=MFC$(MFC_VERSION)D.LIB
!endif
EXE_NAME=leash
WSHELPER=wshelp32
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
