[vlc-commits] msi: provide the arch

[Ludovic Fauvet]

vlc | branch: master | Ludovic Fauvet <etix at videolan.org> | Wed Feb 13 18:24:28 2013 +0100| [126657cf8801e0e4fb1852d56e495adb64a1b3a8] | committer: Rafaël Carré

msi: provide the arch

Signed-off-by: Rafaël Carré <funman at videolan.org>

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

 configure.ac                           |    5 ++++-
 extras/package/win32/msi/config.wxi.in |    4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7fc33d0..238de73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/extras/package/win32/msi/config.wxi.in b/extras/package/win32/msi/config.wxi.in
index b4ab7d2..eb76caa 100644
--- a/extras/package/win32/msi/config.wxi.in
+++ b/extras/package/win32/msi/config.wxi.in
@@ -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" ?>