From: Jeffrey Altman Date: Thu, 12 Feb 2004 13:52:56 +0000 (+0000) Subject: 2004-02-12 Jeffrey Altman X-Git-Tag: krb5-1.4-beta1~623 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ebc2280102d9bcfabe73818bf3b55aaa5265b9e8;p=krb5.git 2004-02-12 Jeffrey Altman * Fix libpath for krbcc32.lib (only affects KRB5_KFW_COMPILE builds) ticket: new target_version: 1.3.2 tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@16065 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/windows/gss/ChangeLog b/src/windows/gss/ChangeLog index 386bc405c..64d57dd7d 100644 --- a/src/windows/gss/ChangeLog +++ b/src/windows/gss/ChangeLog @@ -1,3 +1,7 @@ +2004-02-12 Jeffrey Altman + + * Fix libpath for krbcc32.lib (only affects KRB5_KFW_COMPILE builds) + 2004-02-11 Jeffrey Altman * gss-misc.h: Add file. Copy from src/appl/gss-sample/ diff --git a/src/windows/gss/Makefile.in b/src/windows/gss/Makefile.in index 1c4baa1af..9c87f185d 100644 --- a/src/windows/gss/Makefile.in +++ b/src/windows/gss/Makefile.in @@ -11,7 +11,7 @@ BUILDTOP=..\.. !if defined(KRB5_KFW_COMPILE) KFWINC= /I$(BUILDTOP)\..\..\krbcc\include -KFWLIB= krbcc32.lib +KFWLIB= $(BUILDTOP)\..\..\..\..\target\lib\$(CPU)\$(OUTPRE_DBG)\krbcc32.lib !endif LOCALINCLUDES= /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 $(KFWINC) @@ -22,14 +22,14 @@ RCFLAGS = $(RFLAGS) -D_WIN32 -DGSS_APP ##### Linker LINK = link LIBS = $(GLIB) $(CLIB) $(WLIB) -SYSLIBS = kernel32.lib ws2_32.lib user32.lib gdi32.lib comdlg32.lib comctl32.lib $(KFWLIB) +SYSLIBS = kernel32.lib ws2_32.lib user32.lib gdi32.lib comdlg32.lib comctl32.lib LFLAGS = /nologo $(LOPTS) all:: Makefile $(OUTPRE)gss.exe $(OUTPRE)gss.exe: gss.def $(OBJS) $(XOBJS) $(LIBS) $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ - $(LIBS) $(SYSLIBS) + $(LIBS) $(SYSLIBS) $(KFWLIB) $(OBJS) $(XOBJS): gss.h