Skip to content

V
vlc
Commit 5707ca7f authored by Ludovic Fauvet's avatar Ludovic Fauvet
Browse files
Options

msi: pass the target architecture as parameter to candle 

since the Platform attribute is deprecated.
parent c9224228
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
extras/package/win32/msi.mak
View file @ 5707ca7f
...@@ -24,7 +24,7 @@ heat: package-win-strip ...@@ -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 $(HEAT) dir $(VLCDIR)/skins -cg CompSkinsGroup -gg -scom -sreg -sfrag -srd -dr SKINSDIR -out $(W_MSIBUILDDIR)/Skins.fragment.wxs
candle: 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: light:
test ! -d "$(WINE_C)/v" -o ! -f "$(WINE_C)/v" test ! -d "$(WINE_C)/v" -o ! -f "$(WINE_C)/v"
......
extras/package/win32/msi/product.wxs
View file @ 5707ca7f
...@@ -36,8 +36,7 @@ ...@@ -36,8 +36,7 @@
InstallPrivileges='elevated' InstallPrivileges='elevated'
InstallScope='perMachine' InstallScope='perMachine'
InstallerVersion='200' InstallerVersion='200'
Compressed='yes' Compressed='yes' />
Platform='$(var.Platform)'/>
<MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit."/> <MajorUpgrade Schedule="afterInstallInitialize" DowngradeErrorMessage="A later version of [ProductName] is already installed. Setup will now exit."/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment