[vlc-commits] msi: pass the target architecture as parameter to candle

[Ludovic Fauvet]

vlc | branch: master | Ludovic Fauvet <etix at videolan.org> | Mon Apr  8 20:07:02 2013 +0200| [5707ca7fa00dd9ff7615add6ee6b6a34036ee673] | committer: Ludovic Fauvet

msi: pass the target architecture as parameter to candle

since the Platform attribute is deprecated.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5707ca7fa00dd9ff7615add6ee6b6a34036ee673
---

 extras/package/win32/msi.mak         |    2 +-
 extras/package/win32/msi/product.wxs |    3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/extras/package/win32/msi.mak b/extras/package/win32/msi.mak
index 0d47c06..31d141f 100644
--- 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 c00236f..b065778 100644
--- 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."/>