summaryrefslogtreecommitdiffstats
path: root/src/windows
diff options
context:
space:
mode:
Diffstat (limited to 'src/windows')
-rw-r--r--src/windows/ChangeLog4
-rw-r--r--src/windows/Makefile.in4
-rw-r--r--src/windows/cns/ChangeLog4
-rw-r--r--src/windows/cns/Makefile.in2
-rw-r--r--src/windows/cns/password.c2
-rw-r--r--src/windows/gina/ChangeLog4
-rw-r--r--src/windows/gina/Makefile.in2
-rw-r--r--src/windows/kfwlogon/Makefile.in74
-rw-r--r--src/windows/wintel/ChangeLog4
-rw-r--r--src/windows/wintel/Makefile.in2
10 files changed, 60 insertions, 42 deletions
diff --git a/src/windows/ChangeLog b/src/windows/ChangeLog
index d2fcb8fa24..fe9823d8d7 100644
--- a/src/windows/ChangeLog
+++ b/src/windows/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-24 Jeffrey Altman <jaltman@mit.edu>
+
+ * Makefile.in: support for 64-bit Windows builds
+
2005-11-29 Jeffrey Altman <jaltman@mit.edu>
* Makefile.in: build src/windows/kfwlogon
diff --git a/src/windows/Makefile.in b/src/windows/Makefile.in
index f1045951ae..5285b02f5d 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 d32fd8ac3f..37940a33e4 100644
--- a/src/windows/cns/ChangeLog
+++ b/src/windows/cns/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-24 Jeffrey Altman <jaltman@mit.edu>
+
+ * Makefile.in, password.c: support for 64-bit Windows builds
+
2005-03-15 Jeffrey Altman <jaltman@mit.edu>
* 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 7ea2def124..1e9e50ed6d 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 ad02201f14..b986659949 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 a8d2d05a41..5b6616bb05 100644
--- a/src/windows/gina/ChangeLog
+++ b/src/windows/gina/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-24 Jeffrey Altman <jaltman@mit.edu>
+
+ * Makefile.in: support for 64-bit Windows builds
+
2005-10-20 Jeffrey Altman <jaltman@mit.edu>
* Makefile.in (WINLIBS): Link to the multi-threaded library.
diff --git a/src/windows/gina/Makefile.in b/src/windows/gina/Makefile.in
index 4a3103267c..2aec54469b 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 10e7d4cfb9..0b3879c591 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 63ad7a421e..5339a879cf 100644
--- a/src/windows/wintel/ChangeLog
+++ b/src/windows/wintel/ChangeLog
@@ -1,3 +1,7 @@
+2006-02-24 Jeffrey Altman <jaltman@mit.edu>
+
+ * Makefile.in: support for 64-bit Windows builds
+
2004-09-30 Jeffrey Altman <jaltman@mit.edu>
* 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 3d2b382f04..0603cc4ba0 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)
generated by cgit (git 2.34.1) at 2024-11-12 19:00:35 +0000