summaryrefslogtreecommitdiffstats
path: root/src/util/windows
diff options
context:
space:
mode:
authorJeffrey Altman <jaltman@secure-endpoints.com>2006-02-27 19:22:08 +0000
committerJeffrey Altman <jaltman@secure-endpoints.com>2006-02-27 19:22:08 +0000
commitc53f7fd2ca7d605397091294683eaf63d6b922f2 (patch)
treefab7fe52977a865d764581becde0e1e052742667 /src/util/windows
parent3859c1100296dfba406107fcdf23fc30da385181 (diff)
downloadkrb5-c53f7fd2ca7d605397091294683eaf63d6b922f2.tar.gz
krb5-c53f7fd2ca7d605397091294683eaf63d6b922f2.tar.xz
krb5-c53f7fd2ca7d605397091294683eaf63d6b922f2.zip
Qing Dong <dongq@mit.edu> 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
Diffstat (limited to 'src/util/windows')
-rw-r--r--src/util/windows/ChangeLog4
-rw-r--r--src/util/windows/Makefile.in2
2 files changed, 5 insertions, 1 deletions
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 <jaltman@mit.edu>
+
+ * Makefile.in: support for 64-bit Windows builds
+
2000-02-04 Danilo Almeida <dalmeida@mit.edu>
* 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:$@ $**