From: Benjamin Kaduk Date: Wed, 22 Jan 2014 05:30:21 +0000 (-0500) Subject: Do not link atl.lib into leash X-Git-Tag: kfw-4.1-beta1~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8cba91b5ddb040b34ea046aadd88ab9eceb9b03f;p=thirdparty%2Fkrb5.git Do not link atl.lib into leash We do not consume anything from the Active Template Library, and the atl.lib form of it has been removed from Visual Studio 2013. (cherry picked from commit 8cbe19a290f00de53da284588adc84aabf64092e) ticket: 8190 version_fixed: 1.13.3 status: resolved --- diff --git a/src/windows/leash/Makefile.in b/src/windows/leash/Makefile.in index 31caf5cd46..f3d174f8f4 100644 --- a/src/windows/leash/Makefile.in +++ b/src/windows/leash/Makefile.in @@ -102,7 +102,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 atl.lib $(MFCLIB) $(SCLIB) + ../lib/$(OUTPRE)libwin.lib $(MFCLIB) $(SCLIB) copy $@ "$(OUTPRE)MIT Kerberos.exe" kfwribbon.bml kfwribbon.h kfwribbon.rc: kfwribbon.xml