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
28c8b02b
Commit
28c8b02b
authored
Feb 13, 2013
by
Ludovic Fauvet
Committed by
Rafaël Carré
Feb 14, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: improve 64-bit support
Signed-off-by:
Rafaël Carré
<
funman@videolan.org
>
parent
d1f29d92
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
extras/package/win32/msi/config.wxi.in
extras/package/win32/msi/config.wxi.in
+2
-0
extras/package/win32/msi/product.wxs
extras/package/win32/msi/product.wxs
+4
-3
No files found.
extras/package/win32/msi/config.wxi.in
View file @
28c8b02b
...
...
@@ -23,9 +23,11 @@
<?if $(var.Platform) = "x64" ?>
<?define Win64 = "yes" ?>
<?define PlatformString = "64-bit"?>
<?define PlatformProgramFilesFolder = "ProgramFiles64Folder" ?>
<?else ?>
<?define Win64 = "no" ?>
<?define PlatformString = "32-bit"?>
<?define PlatformProgramFilesFolder = "ProgramFilesFolder" ?>
<?endif ?>
<?define AppFolder = "VLC" ?>
...
...
extras/package/win32/msi/product.wxs
View file @
28c8b02b
...
...
@@ -36,7 +36,8 @@
InstallPrivileges=
'elevated'
InstallScope=
'perMachine'
InstallerVersion=
'200'
Compressed=
'yes'
/>
Compressed=
'yes'
Platforms=
'$(var.Platform)'
/>
<MajorUpgrade
Schedule=
"afterInstallInitialize"
DowngradeErrorMessage=
"A later version of [ProductName] is already installed. Setup will now exit."
/>
...
...
@@ -55,7 +56,7 @@
<Property
Id=
"ApplicationFolderName"
Value=
"$(var.Manufacturer)\$(var.AppFolder)"
/>
<Property
Id=
"WixAppFolder"
Value=
"WixPerMachineFolder"
/>
<Property
Id=
"APPLICATIONFOLDER"
>
<RegistrySearch
Id=
"FindInstallRegDir"
Type=
"raw"
Root=
"HKLM"
Key=
"Software\VideoLAN\VLC"
Name=
"InstallDir"
/>
<RegistrySearch
Id=
"FindInstallRegDir"
Type=
"raw"
Root=
"HKLM"
Win64=
"$(var.Win64)"
Key=
"Software\VideoLAN\VLC"
Name=
"InstallDir"
/>
</Property>
<WixVariable
Id=
"WixUISupportPerUser"
Value=
"0"
/>
...
...
@@ -65,7 +66,7 @@
<Media
Id=
'1'
Cabinet=
'product.cab'
EmbedCab=
'yes'
CompressionLevel=
"high"
/>
<Directory
Id=
'TARGETDIR'
Name=
'SourceDir'
>
<Directory
Id=
'
ProgramFilesFolder
'
Name=
'PFiles'
>
<Directory
Id=
'
$(var.PlatformProgramFilesFolder)
'
Name=
'PFiles'
>
<Directory
Id=
'VideoLANFolder'
Name=
'$(var.Manufacturer)'
>
<Directory
Id=
'APPLICATIONFOLDER'
Name=
'$(var.AppFolder)'
FileSource=
"$(var.SourceDir)"
>
...
...
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