krb5 commit: Don't specify MFC library in Leash build
Greg Hudson <[email protected]>
| Newsgroups | gmane.comp.encryption.kerberos.cvs |
|---|---|
| Message-ID | <[email protected]> |
https://github.com/krb5/krb5/commit/eb46a725a0236ee275ee97c739cef475623d42c6 commit eb46a725a0236ee275ee97c739cef475623d42c6 Author: Greg Hudson <[email protected]> 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