diff options
| author | Gerald Combs <gerald@wireshark.org> | 2023-06-06 17:54:57 -0700 |
|---|---|---|
| committer | AndersBroman <a.broman58@gmail.com> | 2023-06-10 21:41:27 +0000 |
| commit | 049a89b2ce3c1035a7a73c85654230ac1ee11e70 (patch) | |
| tree | eac82e6dce13fd6f9e52f5e6c6ac0a44e1328fc9 /packaging/nsis/logray.nsi | |
| parent | 46f5f7a31f4fde6ba34ace8f0428504610b4aeb6 (diff) | |
CMake+Windows: Use "x64" instead of "win64"
Use "x64" to refer to "Windows running on 64-bit Intel processors". Get
rid of WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE in favor of
WIRESHARK_TARGET_PLATFORM because the latter is shorter.
Diffstat (limited to 'packaging/nsis/logray.nsi')
| -rw-r--r-- | packaging/nsis/logray.nsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packaging/nsis/logray.nsi b/packaging/nsis/logray.nsi index d8888e1b4c..b3b024d71f 100644 --- a/packaging/nsis/logray.nsi +++ b/packaging/nsis/logray.nsi @@ -36,7 +36,7 @@ SetCompressorDictSize 64 ; MB ; ============================================================================ ; The file to write -OutFile "${OUTFILE_DIR}\${PROGRAM_NAME}-${VERSION}-${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE}.exe" +OutFile "${OUTFILE_DIR}\${PROGRAM_NAME}-${VERSION}-${WIRESHARK_TARGET_PLATFORM}.exe" ; Installer icon Icon "${TOP_SRC_DIR}\resources\icons\lograyinst.ico" @@ -258,7 +258,7 @@ Var WIX_UNINSTALLSTRING !include WinMessages.nsh Function .onInit - !if ${WIRESHARK_TARGET_PROCESSOR_ARCHITECTURE} == "x64" + !if ${WIRESHARK_TARGET_PLATFORM} == "x64" ; http://forums.winamp.com/printthread.php?s=16ffcdd04a8c8d52bee90c0cae273ac5&threadid=262873 ${IfNot} ${RunningX64} MessageBox MB_OK "Logray only runs on 64-bit machines." /SD IDOK |