osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

If our target is Win64, install into $PROGRAMFILES64\Wireshark by default. 

(This doesn't work on my test system, but appears to be correct).

svn path=/trunk/; revision=28082
This commit is contained in:
Gerald Combs 2009-04-17 22:09:26 +00:00
parent 16dac84760
commit 1106881244
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packaging/nsis/wireshark.nsi
View File

@ -188,7 +188,12 @@ ComponentText "The following components are available for installation."
DirText "Choose a directory in which to install Wireshark."
; The default installation directory
InstallDir $PROGRAMFILES\Wireshark\
!if ${WIRESHARK_TARGET_PLATFORM} == "win64"
InstallDir $PROGRAMFILES64\Wireshark\
!else
InstallDir $PROGRAMFILES\Wireshark\
!endif
; See if this is an upgrade; if so, use the old InstallDir as default
InstallDirRegKey HKEY_LOCAL_MACHINE SOFTWARE\Wireshark "InstallDir"
@ -262,14 +267,15 @@ Var OLD_INSTDIR
Var OLD_DISPLAYNAME
Var TMP_UNINSTALLER
; ============================================================================
; 64-bit support
; ============================================================================
!include x64.nsh
Function .onInit
!if ${WIRESHARK_TARGET_PLATFORM} == "win64"
; http://forums.winamp.com/printthread.php?s=16ffcdd04a8c8d52bee90c0cae273ac5&threadid=262873
${If} ${RunningX64}
${EnableX64FSRedirection}
${else}
${IfNot} ${RunningX64}
MessageBox MB_OK "This version of Wireshark only runs on x64 machines.\nTry installing the 32-bit version instead."
Abort
${EndIf}