[vlc-commits] Abort installer with a message if a win64 installer is run on win32

Rafaël Carré git at videolan.org
Sat Apr 21 19:43:53 CEST 2012


vlc/vlc-2.0 | branch: master | Rafaël Carré <funman at videolan.org> | Fri Apr 20 23:42:01 2012 -0400| [7d428e056733cf9c779e66ce995c989dcf8b725a] | committer: Jean-Baptiste Kempf

Abort installer with a message if a win64 installer is run on win32
(cherry picked from commit 56b36ede3bd13b33708c601f7483279716d51128)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=7d428e056733cf9c779e66ce995c989dcf8b725a
---

 extras/package/win32/vlc.win32.nsi.in |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/extras/package/win32/vlc.win32.nsi.in b/extras/package/win32/vlc.win32.nsi.in
index 629ee0a..c62cbc7 100644
--- a/extras/package/win32/vlc.win32.nsi.in
+++ b/extras/package/win32/vlc.win32.nsi.in
@@ -776,6 +776,13 @@ SectionEnd
 ;;; Start function
 Function .onInit
 
+ at HAVE_WIN64_TRUE@ !include "x64.nsh"
+ at HAVE_WIN64_TRUE@ ${If} ${RunningX64}
+ at HAVE_WIN64_TRUE@ ${Else}
+ at HAVE_WIN64_TRUE@    MessageBox MB_OK|MB_ICONSTOP "This version of VLC only runs on 64bits operating systems.$\nYour operating system is 32bits.$\n$\nPlease get the 32 BITS version."
+ at HAVE_WIN64_TRUE@    Quit
+ at HAVE_WIN64_TRUE@ ${Endif}
+
 @HAVE_WIN64_TRUE@ SetRegView 64
 ReadRegStr $INSTDIR HKLM "${PRODUCT_DIR_REGKEY}" ""
 StrCmp $INSTDIR "" 0 +1



More information about the vlc-commits mailing list