From: Tom Yu <tlyu@mit.edu>
Date: Sat, 29 Sep 2007 00:03:12 +0000 (+0000)
Subject: pull up r19921 from trunk
X-Git-Tag: krb5-1.6.3-beta2~54
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b988045a53e79195fd61dbc145a25ba894a68b22;p=krb5.git

pull up r19921 from trunk

 r19921@cathode-dark-space:  jaltman | 2007-09-05 12:36:28 -0400
 ticket: new
 subject: 64-bit Windows gss.exe (gui version of gss-client.exe)
 component: windows

 Now that krbcc64.lib exists we can build the gss.exe gss-api test
 client.



ticket: 5710
version_fixed: 1.6.3

git-svn-id: svn://anonsvn.mit.edu/krb5/branches/krb5-1-6@20011 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in
index 5285b02f5..3ba9da6e4 100644
--- a/src/windows/Makefile.in
+++ b/src/windows/Makefile.in
@@ -14,11 +14,9 @@ all-windows::
 	@echo Making in windows\wintel
 	cd ..\wintel
 	$(MAKE) -$(MFLAGS)
-!if ( "$(CPU)" != "ALPHA64" ) && ( "$(CPU)" != "IA64" ) && ( "$(CPU)" != "AMD64" )
        @echo Making in windows\gss
 	cd ..\gss
 	$(MAKE) -$(MFLAGS)
-!endif
 	@echo Making in windows\gina
 	cd ..\gina
 	$(MAKE) -$(MFLAGS)
diff --git a/src/windows/gss/Makefile.in b/src/windows/gss/Makefile.in
index 60c54e823..5413a278a 100644
--- a/src/windows/gss/Makefile.in
+++ b/src/windows/gss/Makefile.in
@@ -11,7 +11,11 @@ BUILDTOP=..\..
 
 !if defined(KRB5_KFW_COMPILE)
 KFWINC= /I$(BUILDTOP)\..\..\krbcc\include
+!if ( "$(CPU)" == "i386" )
 KFWLIB= $(BUILDTOP)\..\..\..\..\target\lib\$(CPU)\$(OUTPRE_DBG)\krbcc32.lib
+!else
+KFWLIB= $(BUILDTOP)\..\..\..\..\target\lib\$(CPU)\$(OUTPRE_DBG)\krbcc64.lib
+!endif
 !endif
 LOCALINCLUDES= /I$(BUILDTOP) /I$(BUILDTOP)\include /I$(BUILDTOP)\include\krb5 $(KFWINC)
 
@@ -29,7 +33,7 @@ all:: Makefile $(OUTPRE)gss.exe
 
 $(OUTPRE)gss.exe: gss.def $(OBJS) $(XOBJS) $(LIBS)
 	$(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \
-	  $(LIBS) $(SYSLIBS) $(KFWLIB)
+	  $(LIBS) $(SYSLIBS) $(KFWLIB) $(SCLIB)
 
 $(OBJS) $(XOBJS): gss.h