oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

Windows: Heimdal.Command.msm MULTIPLATFORM_INSTALL

Browse Source 
When building a multiplatform installer 64-bit Heimdal.Command.msm
should not include the 32-bit components.

Change-Id: I5a3545d50edb69e982ea6b2febb45637764a8ca2
This commit is contained in:
Jeffrey Altman
2013-09-15 11:14:27 -04:00
parent c33969febf
commit 0f1b15492b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/windows/installer/NTMakefile
View File

@@ -180,7 +180,7 @@ CANDLEOPTS=$(CANDLEOPTS) -dTarget64 \
-dRuntimeModule64=$(RUNTIMEMODULE64) \ -dRuntimeModule64=$(RUNTIMEMODULE64) \
!ifdef MULTIPLATFORM_INSTALLER !ifdef MULTIPLATFORM_INSTALLER
CANDLEOPTS=$(CANDLEOPTS) -dTarget32 CANDLEOPTS_MULTI= -dTarget32
TYPEOPT=-full TYPEOPT=-full
!else !else
! message Excluding 32-bit components from installer ! message Excluding 32-bit components from installer
@@ -221,7 +221,7 @@ $(INSTALLER): $(WIXOBJ) $(THIRDPARTYOBJS) $(INSTDEPS) lang\en-us.wxl
$(WIXOBJ): heimdal-installer.wxs $(WIXOBJ): heimdal-installer.wxs
$(CANDLE) -arch $(PLATFORM) -o $@ heimdal-installer.wxs \ $(CANDLE) -arch $(PLATFORM) -o $@ heimdal-installer.wxs \
$(CANDLEOPTS) $(THIRDPARTYOPTS) $(CANDLEOPTS) $(CANDLEOPTS_MULTI) $(THIRDPARTYOPTS)
!if exist(thirdparty\installer\heimdal-command.wxs) !if exist(thirdparty\installer\heimdal-command.wxs)
CMD_WXS=thirdparty\installer\heimdal-command.wxs CMD_WXS=thirdparty\installer\heimdal-command.wxs