summaryrefslogtreecommitdiffstats
path: root/src/windows/installer/wix/custom
diff options
context:
space:
mode:
authorJeffrey Altman <jaltman@secure-endpoints.com>2007-09-05 18:03:13 +0000
committerJeffrey Altman <jaltman@secure-endpoints.com>2007-09-05 18:03:13 +0000
commit1e23b1998c87ff0d2c3ea27a2e112532a13d2b6c (patch)
tree47e9aae451053bdc8d2662095bae31e626c6d897 /src/windows/installer/wix/custom
parent9c243238c6ca6228fde72fa1661d0393a1e08c81 (diff)
downloadkrb5-1e23b1998c87ff0d2c3ea27a2e112532a13d2b6c.tar.gz
krb5-1e23b1998c87ff0d2c3ea27a2e112532a13d2b6c.tar.xz
krb5-1e23b1998c87ff0d2c3ea27a2e112532a13d2b6c.zip
MSI installer for 64-bit AMD64
Add support for building 64-bit AMD64 MSI install packages in addition to 32-bit i386 MSI install packages. Differences between 32-bit MSI and 64-bit MSI include: * no krb4 binaries and libraries * no kclient binaries and libraries * no krb524 binaries and libraries * no leash32.exe * new AMD64 UpgradeCode permits parallel installation with 32-bit MSI * support for Visual Studio 2005 (VS8, CL1400) merge modules Open Issues: * 32-bit MSI installs kfwlogon.dll on AMD64 systems * 32-bit and 64-bit NetIDMgr.exe as startup. Need to decide which should be executed by default. Only one can run at a time. * Need to make sure that src/windows/build properly configures the site-local.wxi file for Visual Studio 2005 and platform. ticket: new component: windows git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19922 dc483132-0cff-0310-8789-dd5450dbe970
Diffstat (limited to 'src/windows/installer/wix/custom')
-rw-r--r--src/windows/installer/wix/custom/custom.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/windows/installer/wix/custom/custom.cpp b/src/windows/installer/wix/custom/custom.cpp
index d6c637845c..a61b632ac1 100644
--- a/src/windows/installer/wix/custom/custom.cpp
+++ b/src/windows/installer/wix/custom/custom.cpp
@@ -87,6 +87,9 @@ SOFTWARE.
// linker stuff
#pragma comment(lib, "msi")
#pragma comment(lib, "advapi32")
+#if defined(_M_IA64) || defined(_M_AMD64)
+#pragma comment(lib, "bufferoverflowu")
+#endif
void ShowMsiError( MSIHANDLE hInstall, DWORD errcode, DWORD param ){