msi: provide the arch

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

diff --git a/configure.ac b/configure.ac
index 7fc33d07435ab3001bd0f9f5348678cca378dbff..238de73ac24da9481e873a4410dfd52fb95fb76f 100644 (file)
--- 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 b4ab7d284edf7a56529eed99ddae5903e9afd5ce..eb76caa8cd5d936f86b7b95460bc8c61bb89de09 100644 (file)
--- 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" ?>