From 0f1b15492b5a73396aef420c02bf1a2419822b64 Mon Sep 17 00:00:00 2001 From: Jeffrey Altman Date: Sun, 15 Sep 2013 11:14:27 -0400 Subject: [PATCH] Windows: Heimdal.Command.msm MULTIPLATFORM_INSTALL When building a multiplatform installer 64-bit Heimdal.Command.msm should not include the 32-bit components. Change-Id: I5a3545d50edb69e982ea6b2febb45637764a8ca2 --- packages/windows/installer/NTMakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/windows/installer/NTMakefile b/packages/windows/installer/NTMakefile index e7fd06d8d..ac3834f95 100644 --- a/packages/windows/installer/NTMakefile +++ b/packages/windows/installer/NTMakefile @@ -180,7 +180,7 @@ CANDLEOPTS=$(CANDLEOPTS) -dTarget64 \ -dRuntimeModule64=$(RUNTIMEMODULE64) \ !ifdef MULTIPLATFORM_INSTALLER -CANDLEOPTS=$(CANDLEOPTS) -dTarget32 +CANDLEOPTS_MULTI= -dTarget32 TYPEOPT=-full !else ! message Excluding 32-bit components from installer @@ -221,7 +221,7 @@ $(INSTALLER): $(WIXOBJ) $(THIRDPARTYOBJS) $(INSTDEPS) lang\en-us.wxl $(WIXOBJ): heimdal-installer.wxs $(CANDLE) -arch $(PLATFORM) -o $@ heimdal-installer.wxs \ - $(CANDLEOPTS) $(THIRDPARTYOPTS) + $(CANDLEOPTS) $(CANDLEOPTS_MULTI) $(THIRDPARTYOPTS) !if exist(thirdparty\installer\heimdal-command.wxs) CMD_WXS=thirdparty\installer\heimdal-command.wxs