From: Jeffrey Altman Date: Mon, 27 Feb 2006 19:22:08 +0000 (+0000) Subject: Qing Dong provided a set of changes to allow X-Git-Tag: krb5-1.5-alpha1~194 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=c53f7fd2ca7d605397091294683eaf63d6b922f2;p=krb5.git Qing Dong provided a set of changes to allow krb5 to build under the Microsoft Visual Studio 8 compiler in 64-bit mode and produce file names that do not conflict with the names produced by the 32-bit build. That patch was modified to work on Unix and also include processor dependent pre-processor definitions to remove warnings. ticket: 3415 tags: pullup git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@17680 dc483132-0cff-0310-8789-dd5450dbe970 --- diff --git a/src/ChangeLog b/src/ChangeLog index a3e3fdb72..586aeea5c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2006-01-17 Ken Raeburn * aclocal.m4 (AC_KRB5_TCL_TRYOLD): Include $LIBS in $TCL_LIBS. diff --git a/src/Makefile.in b/src/Makefile.in index 8b9be5d94..c697e747c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -153,7 +153,7 @@ config-windows:: Makefile-windows # try to build wconfig on a config-windows. # ##DOS##$(WCONFIG_EXE): outpre-dir wconfig.c -##DOS## $(CC) -Fe$@ -Fo$*.obj wconfig.c +##DOS## $(CC) -Fe$@ -Fo$*.obj wconfig.c $(CCLINKOPTION) ##DOS##MKFDEP=$(WCONFIG_EXE) config\win-pre.in config\win-post.in diff --git a/src/appl/gss-sample/ChangeLog b/src/appl/gss-sample/ChangeLog index 15f674580..07ec1f681 100644 --- a/src/appl/gss-sample/ChangeLog +++ b/src/appl/gss-sample/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2005-10-20 Ken Raeburn * gss-client.c, gss-misc.c, gss-server.c: Reindented. diff --git a/src/appl/gss-sample/Makefile.in b/src/appl/gss-sample/Makefile.in index ab6821c49..97d1d8901 100644 --- a/src/appl/gss-sample/Makefile.in +++ b/src/appl/gss-sample/Makefile.in @@ -20,10 +20,10 @@ gss-client: gss-client.o gss-misc.o $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o gss-client gss-client.o gss-misc.o $(GSS_LIBS) $(KRB5_BASE_LIBS) $(OUTPRE)gss-server.exe: $(OUTPRE)gss-server.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB) - link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib + link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(SCLIB) $(OUTPRE)gss-client.exe: $(OUTPRE)gss-client.obj $(OUTPRE)gss-misc.obj $(GLIB) $(KLIB) - link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib + link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib $(SCLIB) clean-unix:: $(RM) gss-server gss-client diff --git a/src/appl/gssftp/ftp/ChangeLog b/src/appl/gssftp/ftp/ChangeLog index 1f17c0f45..e043f104e 100644 --- a/src/appl/gssftp/ftp/ChangeLog +++ b/src/appl/gssftp/ftp/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2003-12-13 Ken Raeburn * ftp.c (do_auth): Handle a return code of 335, where the diff --git a/src/appl/gssftp/ftp/Makefile.in b/src/appl/gssftp/ftp/Makefile.in index 9e15dc6b5..9355f7c40 100644 --- a/src/appl/gssftp/ftp/Makefile.in +++ b/src/appl/gssftp/ftp/Makefile.in @@ -37,7 +37,7 @@ ftp: $(OBJS) $(GSS_DEPLIBS) $(KRB5_BASE_DEPLIBS) $(CC_LINK) -o ftp $(OBJS) $(GSS_LIBS) $(KRB4COMPAT_LIBS) $(OUTPRE)ftp.exe: $(OBJS) $(GLIB) $(KLIB) - link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib advapi32.lib + link $(EXE_LINKOPTS) -out:$@ $** ws2_32.lib advapi32.lib $(SCLIB) clean-unix:: $(RM) ftp diff --git a/src/clients/kpasswd/ChangeLog b/src/clients/kpasswd/ChangeLog index 367cacccd..b6eedd6f7 100644 --- a/src/clients/kpasswd/ChangeLog +++ b/src/clients/kpasswd/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2004-06-24 Tom Yu * kpasswd.c (P1, P2): Cosmetic fix for prompts to avoid diff --git a/src/clients/kpasswd/Makefile.in b/src/clients/kpasswd/Makefile.in index 3f6394342..aacbf91cf 100644 --- a/src/clients/kpasswd/Makefile.in +++ b/src/clients/kpasswd/Makefile.in @@ -26,4 +26,4 @@ install-all install-kdc install-server install-client install-unix:: all-windows:: $(OUTPRE)kpasswd.exe $(OUTPRE)kpasswd.exe: $(OUTPRE)kpasswd.obj $(KLIB) $(CLIB) - link $(EXE_LINKOPTS) -out:$@ $** + link $(EXE_LINKOPTS) -out:$@ $** $(SCLIB) diff --git a/src/config/ChangeLog b/src/config/ChangeLog index 5bfca9ee6..f61eef637 100644 --- a/src/config/ChangeLog +++ b/src/config/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * win-pre.in, win-post.in: support for 64-bit Windows builds + 2006-01-25 Ken Raeburn * shlib.conf (*-*-linux*): Run export-check.pl after building a diff --git a/src/config/win-post.in b/src/config/win-post.in index 74241750a..a568bf9a9 100644 --- a/src/config/win-post.in +++ b/src/config/win-post.in @@ -34,6 +34,14 @@ Makefile: Makefile.in $(BUILDTOP)\config\win-pre.in $(BUILDTOP)\config\win-post. $(WCONFIG) $(BUILDTOP)\config < Makefile.in > Makefile !endif +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +!if defined(WIN64LIBNAME) +LIBNAME=$(WIN64LIBNAME) +!endif +!if defined(WIN64OBJFILE) +OBJFILE=$(WIN64OBJFILE) +!endif +!endif !if defined(LIBNAME) diff --git a/src/config/win-pre.in b/src/config/win-pre.in index 73e7bea6a..2f8b0dad2 100644 --- a/src/config/win-pre.in +++ b/src/config/win-pre.in @@ -31,8 +31,8 @@ CPU=i386 CPU=i386 !endif # CPU == X86 -!if ( "$(CPU)" != "i386" ) && ( "$(CPU)" != "ALPHA" ) -!error Must specify CPU environment variable ( CPU=i386, CPU=ALPHA) +!if ( "$(CPU)" != "i386" ) && ( "$(CPU)" != "ALPHA" ) && ( "$(CPU)" != "ALPHA64" ) && ( "$(CPU)" != "IA64" ) && ( "$(CPU)" != "AMD64" ) +!error Must specify CPU environment variable ( CPU=i386, CPU=ALPHA, CPU=ALPHA64,CPU=IA64, CPU=AMD64) !endif # # End of figuring out CPU @@ -116,6 +116,10 @@ DNSLIBS= DNSFLAGS= !endif +!if ("$(CPU)" == "i386") +TIME_T_FLAGS=-D_USE_32BIT_TIME_T +!endif + !if defined(KRB5_KFW_COMPILE) KFWFLAGS=-DUSE_LEASH=1 !endif @@ -126,10 +130,20 @@ KFWFLAGS=-DUSE_LEASH=1 CC=cl PDB_OPTS=-Fd$(OUTPRE)\ -FD -CPPFLAGS=-I$(SRCTOP)\include -I$(SRCTOP)\include\krb5 $(DNSFLAGS) -DKRB5_PRIVATE=1 -DWIN32_LEAN_AND_MEAN -DKRB5_DEPRECATED=1 $(KFWFLAGS) +CPPFLAGS=-I$(SRCTOP)\include -I$(SRCTOP)\include\krb5 $(DNSFLAGS) -DKRB5_PRIVATE=1 -DWIN32_LEAN_AND_MEAN -DKRB5_DEPRECATED=1 -D_CRT_SECURE_NO_DEPRECATE $(KFWFLAGS) $(TIME_T_FLAGS) CCOPTS=-nologo /W3 $(PDB_OPTS) $(DLL_FILE_DEF) LOPTS=-nologo -incremental:no +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +CCLINKOPTION=/link bufferoverflowu.lib +SCLIB=bufferoverflowu.lib +DEBUGOPT=/Zi +!else +CCLINKOPTION= +SCLIB= +DEBUGOPT=/ZI +!endif + # /ZI gives better debug info in each object file (MSVC 6.0 or higher). # /Zi gives debug info in each object file. # /Gs Avoid stack probes (they don't seem to work anyway) @@ -143,13 +157,13 @@ LOPTS=-nologo -incremental:no # !ifdef NODEBUG !ifdef DEBUG_SYMBOL -CCOPTS=/ZI $(CCOPTS) +CCOPTS=$(DEBUGOPT) $(CCOPTS) LOPTS=$(LOPTS) -debug !endif CCOPTS=/Os /MD $(CCOPTS) LOPTS=$(LOPTS) !else -CCOPTS=/Od /ZI /MDd $(CCOPTS) +CCOPTS=/Od $(DEBUGOPT) /MDd $(CCOPTS) LOPTS=$(LOPTS) -debug !endif @@ -178,6 +192,17 @@ SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt32.lib GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi32.lib WLIB= +!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +CLIB=$(BUILDTOP)\lib\$(OUTPRE)comerr64.lib +PLIB=$(BUILDTOP)\lib\$(OUTPRE)xpprof64.lib +KLIB=$(BUILDTOP)\lib\$(OUTPRE)krb5_64.lib +K4LIB=$(BUILDTOP)\lib\$(OUTPRE)krb4_64.lib +SLIB=$(BUILDTOP)\lib\$(OUTPRE)k5sprt64.lib +GLIB=$(BUILDTOP)\lib\$(OUTPRE)gssapi64.lib +WLIB= + +!endif + KRB4_INCLUDES=-I$(BUILDTOP)/include/kerberosIV COM_ERR_DEPS = $(BUILDTOP)/include/com_err.h diff --git a/src/include/ChangeLog b/src/include/ChangeLog index f630a4902..422de1cb5 100644 --- a/src/include/ChangeLog +++ b/src/include/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * win-mac.h: support for 64-bit Windows builds + 2006-01-25 Ken Raeburn * k5-thread.h (krb5int_mutex_alloc, krb5int_mutex_free, diff --git a/src/include/win-mac.h b/src/include/win-mac.h index ea53cf17f..4249f0db5 100644 --- a/src/include/win-mac.h +++ b/src/include/win-mac.h @@ -25,21 +25,6 @@ #else /* ! RES_ONLY */ -#define SIZEOF_INT 4 -#define SIZEOF_SHORT 2 -#define SIZEOF_LONG 4 - -#include -#include - -#ifndef SIZE_MAX /* in case Microsoft defines max size of size_t */ -#ifdef MAX_SIZE /* Microsoft defines MAX_SIZE as max size of size_t */ -#define SIZE_MAX MAX_SIZE -#else -#define SIZE_MAX UINT_MAX -#endif -#endif - /* To ensure backward compatibility of the ABI use 32-bit time_t on * 32-bit Windows. */ @@ -55,6 +40,21 @@ #endif #endif +#define SIZEOF_INT 4 +#define SIZEOF_SHORT 2 +#define SIZEOF_LONG 4 + +#include +#include + +#ifndef SIZE_MAX /* in case Microsoft defines max size of size_t */ +#ifdef MAX_SIZE /* Microsoft defines MAX_SIZE as max size of size_t */ +#define SIZE_MAX MAX_SIZE +#else +#define SIZE_MAX UINT_MAX +#endif +#endif + #ifndef KRB5_CALLCONV # define KRB5_CALLCONV __stdcall # define KRB5_CALLCONV_C __cdecl diff --git a/src/krb524/ChangeLog b/src/krb524/ChangeLog index 9bf6ff104..58534ccec 100644 --- a/src/krb524/ChangeLog +++ b/src/krb524/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2005-11-17 Ken Raeburn * krb524d.c: Include k5-int.h instead of krb5.h. diff --git a/src/krb524/Makefile.in b/src/krb524/Makefile.in index d7ecfa810..f9b1b9691 100644 --- a/src/krb524/Makefile.in +++ b/src/krb524/Makefile.in @@ -89,7 +89,7 @@ $(K524LIB): $(OUTPRE)krb524.$(OBJEXT) $(OUTPRE)libinit.$(OBJEXT) $(KLIB) $(CLIB) link $(DLL_LINKOPTS) -def:$(K524DEF) -out:$*.dll $** $(WINLIBS) $(OUTPRE)k524init.exe: $(OUTPRE)k524init.$(OBJEXT) $(KLIB) $(K4LIB) $(CLIB) $(BUILDTOP)\util\windows\$(OUTPRE)getopt.lib - link $(EXE_LINKOPTS) -out:$@ $** $(WINLIBS) + link $(EXE_LINKOPTS) -out:$@ $** $(WINLIBS) $(SCLIB) install-unix:: $(INSTALL_PROGRAM) krb524d $(DESTDIR)$(SERVER_BINDIR)/krb524d diff --git a/src/lib/ChangeLog b/src/lib/ChangeLog index cdbd1d1df..d7d57ee92 100644 --- a/src/lib/ChangeLog +++ b/src/lib/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2005-10-31 Jeffrey Altman * gssapi32.def: export missing functions diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in index 3e34ef0ef..736f9a515 100644 --- a/src/lib/Makefile.in +++ b/src/lib/Makefile.in @@ -28,45 +28,54 @@ clean-windows:: ##MIT##MITLIBS=$(VS_LIB) ##MIT##MITFLAGS=-I$(VS_INC) /DVERSERV=1 -SLIBS = $(BUILDTOP)\util\support\$(OUTPRE)k5sprt32.lib -CLIBS = $(BUILDTOP)\util\et\$(OUTPRE)comerr.lib -PLIBS = $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib -KLIBS = krb5\$(OUTPRE)krb5.lib crypto\$(OUTPRE)crypto.lib \ - $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib \ - des425\$(OUTPRE)des425.lib -GLIBS = gssapi\$(OUTPRE)gssapi.lib -K4LIBS = krb4\$(OUTPRE)krb4.lib - -SDEF = k5sprt32.def -CDEF = comerr32.def -PDEF = xpprof32.def -KDEF = krb5_32.def -GDEF = gssapi32.def -K4DEF = krb4_32.def - -KRB5RC = krb5.rc -VERSIONRC = $(BUILDTOP)\windows\version.rc - -WINLIBS = kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib \ - version.lib secur32.lib advapi32.lib gdi32.lib delayimp.lib -WINDLLFLAGS = $(DLL_LINKOPTS) -base:0x1c000000 /DELAYLOAD:secur32.dll \ - /DELAYLOAD:advapi32.dll /DELAY:UNLOAD /DELAY:NOBIND - -S_GLUE=$(OUTPRE)support_glue.obj -K5_GLUE=$(OUTPRE)k5_glue.obj -K4_GLUE=$(OUTPRE)k4_glue.obj -GSS_GLUE=$(OUTPRE)gss_glue.obj -COMERR_GLUE=$(OUTPRE)comerr_glue.obj -PROF_GLUE=$(OUTPRE)prof_glue.obj - -SGLUE=$(S_GLUE) -CGLUE=$(COMERR_GLUE) -PGLUE=$(PROF_GLUE) -KGLUE=$(K5_GLUE) -GGLUE=$(GSS_GLUE) -K4GLUE=$(K4_GLUE) - -RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY + + +##WIN32##!if ("$(CPU)" == "IA64" ) || ("$(CPU)" == "AMD64" ) || ("$(CPU)" == "ALPHA64" ) +##WIN32##SLIBS = $(BUILDTOP)\util\support\$(OUTPRE)k5sprt64.lib +##WIN32##!else +##WIN32##SLIBS = $(BUILDTOP)\util\support\$(OUTPRE)k5sprt32.lib +##WIN32##!endif +##WIN32##CLIBS = $(BUILDTOP)\util\et\$(OUTPRE)comerr.lib +##WIN32##PLIBS = $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib +##WIN32##KLIBS = krb5\$(OUTPRE)krb5.lib crypto\$(OUTPRE)crypto.lib \ +##WIN32## $(BUILDTOP)\util\profile\$(OUTPRE)profile.lib \ +##WIN32## des425\$(OUTPRE)des425.lib +##WIN32##GLIBS = gssapi\$(OUTPRE)gssapi.lib +##WIN32##K4LIBS = krb4\$(OUTPRE)krb4.lib + + +##WIN32##SDEF = k5sprt32.def +##WIN32##CDEF = comerr32.def +##WIN32##PDEF = xpprof32.def +##WIN32##KDEF = krb5_32.def +##WIN32##GDEF = gssapi32.def +##WIN32##K4DEF = krb4_32.def + + + +##WIN32##KRB5RC = krb5.rc +##WIN32##VERSIONRC = $(BUILDTOP)\windows\version.rc + +##WIN32##WINLIBS = kernel32.lib ws2_32.lib user32.lib shell32.lib oldnames.lib \ +##WIN32## version.lib secur32.lib advapi32.lib gdi32.lib delayimp.lib +##WIN32##WINDLLFLAGS = $(DLL_LINKOPTS) -base:0x1c000000 /DELAYLOAD:secur32.dll \ +##WIN32## /DELAYLOAD:advapi32.dll /DELAY:UNLOAD /DELAY:NOBIND + +##WIN32##S_GLUE=$(OUTPRE)support_glue.obj +##WIN32##K5_GLUE=$(OUTPRE)k5_glue.obj +##WIN32##K4_GLUE=$(OUTPRE)k4_glue.obj +##WIN32##GSS_GLUE=$(OUTPRE)gss_glue.obj +##WIN32##COMERR_GLUE=$(OUTPRE)comerr_glue.obj +##WIN32##PROF_GLUE=$(OUTPRE)prof_glue.obj + +##WIN32##SGLUE=$(S_GLUE) +##WIN32##CGLUE=$(COMERR_GLUE) +##WIN32##PGLUE=$(PROF_GLUE) +##WIN32##KGLUE=$(K5_GLUE) +##WIN32##GGLUE=$(GSS_GLUE) +##WIN32##K4GLUE=$(K4_GLUE) + +##WIN32##RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY ##WIN32##SRES=$(SLIB:.lib=.res) ##WIN32##CRES=$(CLIB:.lib=.res) @@ -91,16 +100,16 @@ RCFLAGS=$(CPPFLAGS) -I$(SRCTOP) -D_WIN32 -DRES_ONLY ##WIN32##$(SLIB): $(SDEF) $(SLIBS) $(SGLUE) $(SRES) ##WIN32## link $(WINDLLFLAGS) -def:$(SDEF) -out:$*.dll \ -##WIN32## $(SLIBS) $(SGLUE) $(SRES) $(WINLIBS) -$(SDEF): ..\util\support\libkrb5support.exports - echo EXPORTS > $(SDEF).new - type ..\util\support\libkrb5support.exports >> $(SDEF).new - -$(RM) $(SDEF) - ren $(SDEF).new $(SDEF) +##WIN32## $(SLIBS) $(SGLUE) $(SRES) $(WINLIBS) $(SCLIB) +##WIN32##$(SDEF): ..\util\support\libkrb5support.exports +##WIN32## echo EXPORTS > $(SDEF).new +##WIN32## type ..\util\support\libkrb5support.exports >> $(SDEF).new +##WIN32## -$(RM) $(SDEF) +##WIN32## ren $(SDEF).new $(SDEF) ##WIN32##$(CLIB): $(CDEF) $(CLIBS) $(CGLUE) $(CRES) $(SLIB) ##WIN32## link $(WINDLLFLAGS) -def:$(CDEF) -out:$*.dll \ -##WIN32## $(CLIBS) $(CGLUE) $(CRES) $(SLIB) $(WINLIBS) +##WIN32## $(CLIBS) $(CGLUE) $(CRES) $(SLIB) $(WINLIBS) $(SCLIB) ##WIN32##$(PLIB): $(PDEF) $(PLIBS) $(PGLUE) $(PRES) $(CLIB) $(SLIB) ##WIN32## link $(WINDLLFLAGS) -def:$(PDEF) -out:$*.dll \ @@ -108,73 +117,73 @@ $(SDEF): ..\util\support\libkrb5support.exports ##WIN32##$(KLIB): $(KDEF) $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(SLIB) $(MITLIBS) $(DNSLIBS) ##WIN32## link $(WINDLLFLAGS) -def:$(KDEF) -out:$*.dll \ -##WIN32## $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(SLIB) $(MITLIBS) $(DNSLIBS) $(WINLIBS) +##WIN32## $(KLIBS) $(KGLUE) $(KRES) $(CLIB) $(SLIB) $(MITLIBS) $(DNSLIBS) $(WINLIBS) $(SCLIB) ##WIN32##$(GLIB): $(GDEF) $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB) ##WIN32## link $(WINDLLFLAGS) -def:$(GDEF) -out:$*.dll \ -##WIN32## $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB) $(WINLIBS) +##WIN32## $(GLIBS) $(GGLUE) $(GRES) $(KLIB) $(CLIB) $(SLIB) $(WINLIBS) $(SCLIB) ##WIN32##$(K4LIB): $(K4DEF) $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) ##WIN32## link $(WINDLLFLAGS) -def:$(K4DEF) -out:$*.dll \ -##WIN32## $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) $(WINLIBS) - -$(K5_GLUE): win_glue.c - $(CC) $(ALL_CFLAGS) $(MITFLAGS) /c /DKRB5=1 /Fo$@ $** -$(K4_GLUE): win_glue.c - $(CC) $(ALL_CFLAGS) /c /DKRB4=1 /Fo$@ $** -$(GSS_GLUE): win_glue.c - $(CC) $(ALL_CFLAGS) /c /DGSSAPI=1 /Fo$@ $** -$(COMERR_GLUE): win_glue.c - $(CC) $(ALL_CFLAGS) /c /DCOMERR=1 /Fo$@ $** -$(PROF_GLUE): win_glue.c - $(CC) $(ALL_CFLAGS) /c /DPROFILELIB=1 /Fo$@ $** -$(S_GLUE): win_glue.c - $(CC) $(ALL_CFLAGS) /c /DSUPPORTLIB=1 /Fo$@ $** - -# Build Convenience -comerr.lib: $(CLIB) -krb4.lib: $(K4LIB) -krb5.lib: $(KLIB) -gssapi.lib: $(GLIB) -profile.lib: $(PLIB) - -all-windows:: - @echo Making in lib\crypto - cd crypto - $(MAKE) -$(MFLAGS) - @echo Making in lib\krb5 - cd ..\krb5 - $(MAKE) -$(MFLAGS) - @echo Making in lib\des425 - cd ..\des425 - $(MAKE) -$(MFLAGS) - @echo Making in lib\krb4 - cd ..\krb4 - $(MAKE) -$(MFLAGS) - @echo Making in lib\gssapi - cd ..\gssapi - $(MAKE) -$(MFLAGS) - @echo Making in lib - cd .. - -all-windows:: lib-windows -lib-windows:: krb5.lib gssapi.lib krb4.lib - -clean-windows:: - @echo Making clean in lib\crypto - cd crypto - $(MAKE) -$(MFLAGS) clean - @echo Making clean in lib\krb5 - cd ..\krb5 - $(MAKE) -$(MFLAGS) clean - @echo Making clean in lib\des425 - cd ..\des425 - $(MAKE) -$(MFLAGS) clean - @echo Making clean in lib\krb4 - cd ..\krb4 - $(MAKE) -$(MFLAGS) clean - @echo Making clean in lib\gssapi - cd ..\gssapi - $(MAKE) -$(MFLAGS) clean - @echo Making clean in lib - cd .. +##WIN32## $(K4LIBS) $(K4GLUE) $(K4RES) $(KLIB) $(CLIB) $(PLIB) $(WINLIBS) $(SCLIB) + +##WIN32##$(K5_GLUE): win_glue.c +##WIN32## $(CC) $(ALL_CFLAGS) $(MITFLAGS) /c /DKRB5=1 /Fo$@ $** +##WIN32##$(K4_GLUE): win_glue.c +##WIN32## $(CC) $(ALL_CFLAGS) /c /DKRB4=1 /Fo$@ $** +##WIN32##$(GSS_GLUE): win_glue.c +##WIN32## $(CC) $(ALL_CFLAGS) /c /DGSSAPI=1 /Fo$@ $** +##WIN32##$(COMERR_GLUE): win_glue.c +##WIN32## $(CC) $(ALL_CFLAGS) /c /DCOMERR=1 /Fo$@ $** +##WIN32##$(PROF_GLUE): win_glue.c +##WIN32## $(CC) $(ALL_CFLAGS) /c /DPROFILELIB=1 /Fo$@ $** +##WIN32##$(S_GLUE): win_glue.c +##WIN32## $(CC) $(ALL_CFLAGS) /c /DSUPPORTLIB=1 /Fo$@ $** + +##WIN32### Build Convenience +##WIN32##comerr.lib: $(CLIB) +##WIN32##krb4.lib: $(K4LIB) +##WIN32##krb5.lib: $(KLIB) +##WIN32##gssapi.lib: $(GLIB) +##WIN32##profile.lib: $(PLIB) + +##WIN32##all-windows:: +##WIN32## @echo Making in lib\crypto +##WIN32## cd crypto +##WIN32## $(MAKE) -$(MFLAGS) +##WIN32## @echo Making in lib\krb5 +##WIN32## cd ..\krb5 +##WIN32## $(MAKE) -$(MFLAGS) +##WIN32## @echo Making in lib\des425 +##WIN32## cd ..\des425 +##WIN32## $(MAKE) -$(MFLAGS) +##WIN32## @echo Making in lib\krb4 +##WIN32## cd ..\krb4 +##WIN32## $(MAKE) -$(MFLAGS) +##WIN32## @echo Making in lib\gssapi +##WIN32## cd ..\gssapi +##WIN32## $(MAKE) -$(MFLAGS) +##WIN32## @echo Making in lib +##WIN32## cd .. + +##WIN32##all-windows:: lib-windows +##WIN32##lib-windows:: krb5.lib gssapi.lib krb4.lib + +##WIN32##clean-windows:: +##WIN32## @echo Making clean in lib\crypto +##WIN32## cd crypto +##WIN32## $(MAKE) -$(MFLAGS) clean +##WIN32## @echo Making clean in lib\krb5 +##WIN32## cd ..\krb5 +##WIN32## $(MAKE) -$(MFLAGS) clean +##WIN32## @echo Making clean in lib\des425 +##WIN32## cd ..\des425 +##WIN32## $(MAKE) -$(MFLAGS) clean +##WIN32## @echo Making clean in lib\krb4 +##WIN32## cd ..\krb4 +##WIN32## $(MAKE) -$(MFLAGS) clean +##WIN32## @echo Making clean in lib\gssapi +##WIN32## cd ..\gssapi +##WIN32## $(MAKE) -$(MFLAGS) clean +##WIN32## @echo Making clean in lib +##WIN32## cd .. diff --git a/src/lib/krb5/os/ChangeLog b/src/lib/krb5/os/ChangeLog index 6e35592cb..d9bda00a6 100644 --- a/src/lib/krb5/os/ChangeLog +++ b/src/lib/krb5/os/ChangeLog @@ -1,3 +1,8 @@ +2006-02-24 Jeffrey Altman + + * gmt_mktime.c, read_pwd.c: changes to support 64-bit builds + on Windows + 2005-11-14 Jeffrey Altman * toffset.c: (krb5_set_real_time, krb5_set_debugging_time, diff --git a/src/lib/krb5/os/read_pwd.c b/src/lib/krb5/os/read_pwd.c index 0e3d53ef9..6f2868da7 100644 --- a/src/lib/krb5/os/read_pwd.c +++ b/src/lib/krb5/os/read_pwd.c @@ -209,7 +209,7 @@ read_pwd_proc(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) switch(msg) { case WM_INITDIALOG: dp = (pwd_params *) lParam; - SetWindowLong(hdlg, DWL_USER, lParam); + SetWindowLongPtr(hdlg, DWLP_USER, lParam); SetDlgItemText(hdlg, ID_READ_PWD_PROMPT, dp->pwd_prompt); SetDlgItemText(hdlg, ID_READ_PWD_PROMPT2, dp->pwd_prompt2); SetDlgItemText(hdlg, ID_READ_PWD_PWD, ""); @@ -217,7 +217,7 @@ read_pwd_proc(HWND hdlg, UINT msg, WPARAM wParam, LPARAM lParam) return TRUE; case WM_COMMAND: - dp = (pwd_params *) GetWindowLong(hdlg, DWL_USER); + dp = (pwd_params *) GetWindowLongPtr(hdlg, DWLP_USER); switch (wParam) { case IDOK: *(dp->pwd_size_return) = diff --git a/src/util/support/ChangeLog b/src/util/support/ChangeLog index 7bdcc32b1..7c3c3648e 100644 --- a/src/util/support/ChangeLog +++ b/src/util/support/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2006-01-25 Ken Raeburn * threads.c (krb5int_mutex_alloc, krb5int_mutex_free, diff --git a/src/util/support/Makefile.in b/src/util/support/Makefile.in index 5a8fcff16..5abd3a27e 100644 --- a/src/util/support/Makefile.in +++ b/src/util/support/Makefile.in @@ -6,8 +6,10 @@ RELDIR=../util/support ##DOS##BUILDTOP = ..\.. ##DOS##LIBNAME=$(OUTPRE)k5sprt32.lib +##DOS##WIN64LIBNAME=$(OUTPRE)k5sprt64.lib ##DOS##XTRA= ##DOS##OBJFILE=$(OUTPRE)k5sprt32.lst +##DOS##WIN64OBJFILE=$(OUTPRE)k5sprt64.lst SED = sed diff --git a/src/util/windows/ChangeLog b/src/util/windows/ChangeLog index 96fd0aee4..06ce8afbb 100644 --- a/src/util/windows/ChangeLog +++ b/src/util/windows/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2000-02-04 Danilo Almeida * getopt.c, getopt_long.c, getopt.h: Update to latest BSD code diff --git a/src/util/windows/Makefile.in b/src/util/windows/Makefile.in index be5d4f5d6..102ae741c 100644 --- a/src/util/windows/Makefile.in +++ b/src/util/windows/Makefile.in @@ -3,7 +3,7 @@ BUILDTOP = ..\.. all-windows:: $(OUTPRE)libecho.exe $(OUTPRE)getopt.lib $(OUTPRE)libecho.exe: $(OUTPRE)libecho.obj - link -out:$@ $** + link -out:$@ $** $(SCLIB) $(OUTPRE)getopt.lib: $(OUTPRE)getopt.obj $(OUTPRE)getopt_long.obj lib -out:$@ $** diff --git a/src/windows/ChangeLog b/src/windows/ChangeLog index d2fcb8fa2..fe9823d8d 100644 --- a/src/windows/ChangeLog +++ b/src/windows/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2005-11-29 Jeffrey Altman * Makefile.in: build src/windows/kfwlogon diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in index f1045951a..5285b02f5 100644 --- a/src/windows/Makefile.in +++ b/src/windows/Makefile.in @@ -14,9 +14,11 @@ all-windows:: @echo Making in windows\wintel cd ..\wintel $(MAKE) -$(MFLAGS) - @echo Making in windows\gss +!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/cns/ChangeLog b/src/windows/cns/ChangeLog index d32fd8ac3..37940a33e 100644 --- a/src/windows/cns/ChangeLog +++ b/src/windows/cns/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in, password.c: support for 64-bit Windows builds + 2005-03-15 Jeffrey Altman * tktlist.c: do not mix pointers to long and time_t diff --git a/src/windows/cns/Makefile.in b/src/windows/cns/Makefile.in index 7ea2def12..1e9e50ed6 100644 --- a/src/windows/cns/Makefile.in +++ b/src/windows/cns/Makefile.in @@ -54,7 +54,7 @@ all:: Makefile $(OUTPRE)$(NAME).exe $(OUTPRE)$(NAME).exe: $(NAME).def $(OBJS) $(XOBJS) $(LIBS) $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ - $(LIBS) $(SYSLIBS) + $(LIBS) $(SYSLIBS) $(SCLIB) install:: $(CP) $(OUTPRE)$(NAME).exe $(DESTDIR) diff --git a/src/windows/cns/password.c b/src/windows/cns/password.c index ad02201f1..b98665994 100644 --- a/src/windows/cns/password.c +++ b/src/windows/cns/password.c @@ -277,7 +277,7 @@ password_dlg_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) case WM_SETCURSOR: if (isblocking) { SetCursor(LoadCursor(NULL, IDC_WAIT)); - SetWindowLong(hwnd, DWL_MSGRESULT, TRUE); + SetWindowLongPtr(hwnd, DWLP_MSGRESULT, TRUE); return TRUE; } diff --git a/src/windows/gina/ChangeLog b/src/windows/gina/ChangeLog index a8d2d05a4..5b6616bb0 100644 --- a/src/windows/gina/ChangeLog +++ b/src/windows/gina/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2005-10-20 Jeffrey Altman * Makefile.in (WINLIBS): Link to the multi-threaded library. diff --git a/src/windows/gina/Makefile.in b/src/windows/gina/Makefile.in index 4a3103267..2aec54469 100644 --- a/src/windows/gina/Makefile.in +++ b/src/windows/gina/Makefile.in @@ -27,7 +27,7 @@ clean-windows:: $(OUTPRE)kgina.dll: $(OBJS) $(KLIB) $(CLIB) link $(WINDLLFLAGS) -def:gina.def -out:$*.dll \ - $** $(WINLIBS) + $** $(WINLIBS) $(SCLIB) $(OUTPRE)ginastub.obj: ginastub.h diff --git a/src/windows/kfwlogon/Makefile.in b/src/windows/kfwlogon/Makefile.in index 10e7d4cfb..0b3879c59 100644 --- a/src/windows/kfwlogon/Makefile.in +++ b/src/windows/kfwlogon/Makefile.in @@ -1,37 +1,37 @@ -# Makefile for the KFW Network Provider -# - -thisconfigdir=./.. -myfulldir=windows/nplogon -mydir=. -BUILDTOP=$(REL)..$(S).. -DEFINES = -LOCALINCLUDES = -I$(BUILDTOP) -I$(PISMERE)\athena\util\loadfuncs \ - -I$(PISMERE)\athena\auth\krb5\src\include\kerberosIV \ - -I$(PISMERE)\athena\auth\krb4\include \ - -I$(PISMERE)\athena\auth\leash\include -PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR) - -SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib -RFLAGS = $(LOCALINCLUDES) -RCFLAGS = $(RFLAGS) -D_WIN32 - -all-windows:: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe - -$(OUTPRE)kfwlogon.res: kfwlogon.rc ..\version.rc - -$(OUTPRE)kfwcpcc.res: kfwcpcc.rc ..\version.rc - -$(OUTPRE)kfwlogon.dll: $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwlogon.res - link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) - -$(OUTPRE)kfwcpcc.exe: $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwcpcc.res - link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) - -install:: - copy $(OUTPRE)kfwlogon.dll $(DESTDIR) - copy $(OUTPRE)kfwcpcc.exe $(DESTDIR) - -clean:: - $(RM) $(OUTPRE)*.exe $(OUTPRE)*.dll $(OUTPRE)*.res - +# Makefile for the KFW Network Provider +# + +thisconfigdir=./.. +myfulldir=windows/nplogon +mydir=. +BUILDTOP=$(REL)..$(S).. +DEFINES = +LOCALINCLUDES = -I$(BUILDTOP) -I$(PISMERE)\athena\util\loadfuncs \ + -I$(PISMERE)\athena\auth\krb5\src\include\kerberosIV \ + -I$(PISMERE)\athena\auth\krb4\include \ + -I$(PISMERE)\athena\auth\leash\include +PROG_LIBPATH=-L$(TOPLIBD) -L$(KRB5_LIBDIR) + +SYSLIBS = kernel32.lib user32.lib advapi32.lib wsock32.lib secur32.lib +RFLAGS = $(LOCALINCLUDES) +RCFLAGS = $(RFLAGS) -D_WIN32 + +all-windows:: $(OUTPRE)kfwlogon.dll $(OUTPRE)kfwcpcc.exe + +$(OUTPRE)kfwlogon.res: kfwlogon.rc ..\version.rc + +$(OUTPRE)kfwcpcc.res: kfwcpcc.rc ..\version.rc + +$(OUTPRE)kfwlogon.dll: $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwlogon.res + link $(DLL_LINKOPTS) -out:$@ $(OUTPRE)kfwlogon.obj $(OUTPRE)kfwcommon.obj -entry:DllEntryPoint -def:kfwlogon.def $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB) + +$(OUTPRE)kfwcpcc.exe: $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(OUTPRE)kfwcpcc.res + link $(EXE_LINKOPTS) -out:$@ $(OUTPRE)kfwcpcc.obj $(OUTPRE)kfwcommon.obj $(SYSLIBS) $(KLIB) $(CLIB) $(SCLIB) + +install:: + copy $(OUTPRE)kfwlogon.dll $(DESTDIR) + copy $(OUTPRE)kfwcpcc.exe $(DESTDIR) + +clean:: + $(RM) $(OUTPRE)*.exe $(OUTPRE)*.dll $(OUTPRE)*.res + diff --git a/src/windows/wintel/ChangeLog b/src/windows/wintel/ChangeLog index 63ad7a421..5339a879c 100644 --- a/src/windows/wintel/ChangeLog +++ b/src/windows/wintel/ChangeLog @@ -1,3 +1,7 @@ +2006-02-24 Jeffrey Altman + + * Makefile.in: support for 64-bit Windows builds + 2004-09-30 Jeffrey Altman * Makefile.in: Add $(BUILDTOP) to include path for patchlevel.h diff --git a/src/windows/wintel/Makefile.in b/src/windows/wintel/Makefile.in index 3d2b382f0..0603cc4ba 100644 --- a/src/windows/wintel/Makefile.in +++ b/src/windows/wintel/Makefile.in @@ -34,7 +34,7 @@ all:: Makefile $(OUTPRE)telnet.exe $(OUTPRE)telnet.exe: telnet.def $(OBJS) $(XOBJS) $(LIBS) $(LINK) $(LFLAGS) /map:$*.map /out:$@ $(OBJS) $(XOBJS) \ - $(LIBS) $(SYSLIBS) + $(LIBS) $(SYSLIBS) $(SCLIB) install:: copy $(OUTPRE)telnet.exe $(DESTDIR)