diff options
Diffstat (limited to 'src/windows/installer/wix/config.wxi')
-rw-r--r-- | src/windows/installer/wix/config.wxi | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/windows/installer/wix/config.wxi b/src/windows/installer/wix/config.wxi index 734e16c08e..e1f48a8b14 100644 --- a/src/windows/installer/wix/config.wxi +++ b/src/windows/installer/wix/config.wxi @@ -48,23 +48,20 @@ <?define InstallerVersion="110"?> <?define Platform="Intel"?> <?define Win64="no"?> + <?define BinDir="$(var.TargetDir)bin\i386\"?> + <?define LibDir="$(var.TargetDir)lib\i386\"?> <?elseif $(env.CPU) = "AMD64"?> <?define InstallerVersion="200"?> <?define Platform="x64"?> <?define Win64="yes"?> + <?define BinDir="$(var.TargetDir)bin\amd64\"?> + <?define LibDir="$(var.TargetDir)lib\amd64\"?> <?else?> <?error Unknown build type?> <?endif?> <?define KfwRegRoot="SOFTWARE\MIT\Kerberos"?> - <?if $(env.CPU) = "i386"?> - <?define BinDir="$(var.TargetDir)bin\i386\"?> - <?define LibDir="$(var.TargetDir)lib\i386\"?> - <?else?> - <?define BinDir="$(var.TargetDir)bin\amd64\"?> - <?define LibDir="$(var.TargetDir)lib\amd64\"?> - <?endif?> <?define DocDir="$(var.TargetDir)doc\"?> <?define IncDir="$(var.TargetDir)inc\"?> <?define InstallDir="$(var.TargetDir)install\"?> |