From: Thomas Sondergaard <thomas.sondergaard@karoshealth.com>
Date: Tue, 11 Aug 2015 06:31:53 +0000 (+0200)
Subject: Pick MFC version based on VisualStudioVersion
X-Git-Tag: krb5-1.14-alpha1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=705c2a4f21f64e0ee5be10eeffbc8c78c27a518d;p=thirdparty%2Fkrb5.git

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
---

diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in
index f3337f428a..83e2b6295e 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