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
126657cf
Commit
126657cf
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: provide the arch
Signed-off-by:
Rafaël Carré
<
funman@videolan.org
>
parent
fc2b9d97
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
configure.ac
configure.ac
+4
-1
extras/package/win32/msi/config.wxi.in
extras/package/win32/msi/config.wxi.in
+2
-2
No files found.
configure.ac
View file @
126657cf
...
...
@@ -236,17 +236,20 @@ case "${host_os}" in
DESTDIR="`pwd`/_win32/"
dnl
dnl NSIS Installer prefix and WIN64
dnl NSIS
/MSI
Installer prefix and WIN64
dnl
case "${host}" in
amd64*|x86_64*)
HAVE_WIN64="1"
WINDOWS_ARCH="x64"
PROGRAMFILES="PROGRAMFILES64"
;;
*)
WINDOWS_ARCH="x86"
PROGRAMFILES="PROGRAMFILES"
;;
esac
AC_SUBST(WINDOWS_ARCH)
AC_SUBST(PROGRAMFILES)
fi
...
...
extras/package/win32/msi/config.wxi.in
View file @
126657cf
...
...
@@ -6,7 +6,6 @@
<?define AboutURL = "http://www.videolan.org/vlc/" ?>
<?define SupportURL = "http://www.videolan.org/support/" ?>
<?define UpdatesURL = "http://www.videolan.org/vlc/" ?>
<?define Platform= "x86" ?>
<?define VerMajor = "@VERSION_MAJOR@" ?>
<?define VerMinor = "@VERSION_MINOR@" ?>
...
...
@@ -19,8 +18,9 @@
<?define LocalePath = "$(var.BinPath)\locale" ?>
<?define SdkPath = "$(var.BinPath)\sdk" ?>-->
<?define Platform= "@WINDOWS_ARCH@" ?>
<?if $(var.Platform) =
x64
?>
<?if $(var.Platform) =
"x64"
?>
<?define Win64 = "yes" ?>
<?else ?>
<?define Win64 = "no" ?>
...
...
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