[30207] in CVS-changelog-for-Kerberos-V5
krb5 commit: Don't specify MFC library in Leash build
daemon@ATHENA.MIT.EDU (Greg Hudson)
Sun May 13 01:13:59 2018
Date: Sun, 13 May 2018 01:13:42 -0400
From: Greg Hudson <ghudson@mit.edu>
Message-Id: <201805130513.w4D5DgO1023871@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/eb46a725a0236ee275ee97c739cef475623d42c6
commit eb46a725a0236ee275ee97c739cef475623d42c6
Author: Greg Hudson <ghudson@mit.edu>
Date: Sat May 5 17:53:54 2018 -0400
Don't specify MFC library in Leash build
Since MFC 3.0 (which shipped with Visual C++ 2.0, decades ago) it has
been unnecessary to specify the MFC library in the link line; the
headers can magically add the right one. Guessing the MFC version
from $(VISUALSTUDIOVERSION) does not work with Visual Studio 2017 (we
guess 150; the correct value is 140).
ticket: 8678 (new)
src/windows/leash/Makefile.in | 13 +------------
1 files changed, 1 insertions(+), 12 deletions(-)
diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in
index 1b124e9..7ab669a 100644
--- a/src/windows/leash/Makefile.in
+++ b/src/windows/leash/Makefile.in
@@ -14,17 +14,6 @@ AFS_INCLUDES=
AFS_LIBS=
!endif
-!if defined(VISUALSTUDIOVERSION)
-MFC_VERSION=$(VISUALSTUDIOVERSION:.=)
-!else
-MFC_VERSION=100
-!endif
-
-!if defined(NODEBUG)
-MFCLIB=MFC$(MFC_VERSION).LIB
-!else
-MFCLIB=MFC$(MFC_VERSION)D.LIB
-!endif
EXE_NAME=leash
WSHELPER=wshelp32
@@ -101,7 +90,7 @@ all: Makefile $(OUTPRE)$(EXE_NAME).exe
$(OUTPRE)$(EXE_NAME).exe: $(OBJS) $(XOBJS) $(LIBS)
$(LINK) $(LFLAGS) /out:$@ /ENTRY:WinMainCRTStartup $(OBJS) $(XOBJS) \
$(LIBS) $(SYSLIBS) $(BUILDTOP)\util\wshelper\$(OUTPRE)$(WSHELPER).lib \
- ../lib/$(OUTPRE)libwin.lib $(MFCLIB) $(SCLIB)
+ ../lib/$(OUTPRE)libwin.lib $(SCLIB)
copy $@ "$(OUTPRE)MIT Kerberos.exe"
kfwribbon.bml kfwribbon.h kfwribbon.rc: kfwribbon.xml
_______________________________________________
cvs-krb5 mailing list
cvs-krb5@mit.edu
https://mailman.mit.edu/mailman/listinfo/cvs-krb5
