msi: pass the target architecture as parameter to candle

since the Platform attribute is deprecated.

diff --git a/extras/package/win32/msi.mak b/extras/package/win32/msi.mak
index 0d47c06deb40414c9788d8f5c52ccd56166eec65..31d141fa501bfb6ba66fec79c425e232673b22d3 100644 (file)
--- a/extras/package/win32/msi.mak
+++ b/extras/package/win32/msi.mak
@@ -24,7 +24,7 @@ heat: package-win-strip
        $(HEAT) dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -srd -dr SKINSDIR -out $(W_MSIBUILDDIR)/Skins.fragment.wxs
 
 candle:
-       $(am__cd) $(MSIBUILDDIR) && $(CANDLE) -ext WiXUtilExtension $(W_MSIDIR)\\product.wxs $(W_MSIDIR)\\axvlc.wxs $(W_MSIDIR)\\extensions.wxs $(W_MSIBUILDDIR)\\*.fragment.wxs
+       $(am__cd) $(MSIBUILDDIR) && $(CANDLE) -arch $(WINDOWS_ARCH) -ext WiXUtilExtension $(W_MSIDIR)\\product.wxs $(W_MSIDIR)\\axvlc.wxs $(W_MSIDIR)\\extensions.wxs $(W_MSIBUILDDIR)\\*.fragment.wxs
 
 light:
        test ! -d "$(WINE_C)/v" -o ! -f "$(WINE_C)/v"

diff --git a/extras/package/win32/msi/product.wxs b/extras/package/win32/msi/product.wxs
index c00236fe8dae2deb1518a85bb38b43efd03da0f4..b065778055bc271e0dad144c31045729e3a5df59 100644 (file)
--- a/extras/package/win32/msi/product.wxs
+++ b/extras/package/win32/msi/product.wxs
@@ -36,8 +36,7 @@
             InstallPrivileges='elevated'
             InstallScope='perMachine'
             InstallerVersion='200'
-            Compressed='yes'
-            Platform='$(var.Platform)'/>
+            Compressed='yes' />
 
         <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit."/>