Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
5707ca7f
Commit
5707ca7f
authored
Apr 08, 2013
by
Ludovic Fauvet
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: pass the target architecture as parameter to candle
since the Platform attribute is deprecated.
parent
c9224228
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
3 deletions
+2
-3
extras/package/win32/msi.mak
extras/package/win32/msi.mak
+1
-1
extras/package/win32/msi/product.wxs
extras/package/win32/msi/product.wxs
+1
-2
No files found.
extras/package/win32/msi.mak
View file @
5707ca7f
...
...
@@ -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"
...
...
extras/package/win32/msi/product.wxs
View file @
5707ca7f
...
...
@@ -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."
/>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment