You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
[project/Win32BuildSetup] Fix Windows ARM64 detection. Add prompts when attempting to install x86 or x64 on ARM64 machine. Specify minimum NSIS version in documentation.
Copy file name to clipboardExpand all lines: docs/README.Windows.md
+1-1Lines changed: 1 addition & 1 deletion
Original file line number
Diff line number
Diff line change
@@ -55,7 +55,7 @@ To build Kodi:
55
55
***[CMake](https://cmake.org/download/)** (version 3.20 or greater is required to build Kodi, version 3.21 or greater to build with Visual Studio 2022)
56
56
***[Git for Windows](https://gitforwindows.org/)**
***[Nullsoft scriptable install system (NSIS)](http://nsis.sourceforge.net/Download)** (Only needed if you want to generate an installer file)
58
+
***[Nullsoft scriptable install system (NSIS)](http://nsis.sourceforge.net/Download)**version 3.04 or greater (Only needed if you want to generate an installer file)
59
59
***[Visual Studio 2022](https://visualstudio.microsoft.com/downloads/)** or **[Visual Studio 2019](https://visualstudio.microsoft.com/vs/older-downloads/)** (Community Edition is fine)
60
60
61
61
To run Kodi you need a relatively recent CPU with integrated GPU or discrete GPU with up-to-date graphics device-drivers installed from the manufacturer's website.
Copy file name to clipboardExpand all lines: project/Win32BuildSetup/genNsisInstaller.nsi
+26-4Lines changed: 26 additions & 4 deletions
Original file line number
Diff line number
Diff line change
@@ -21,6 +21,8 @@
21
21
;Default installation folder
22
22
!ifdef x64
23
23
InstallDir"$PROGRAMFILES64\${APP_NAME}"
24
+
!else ifdef arm64
25
+
InstallDir"$PROGRAMFILES64\${APP_NAME}"
24
26
!else
25
27
InstallDir"$PROGRAMFILES\${APP_NAME}"
26
28
!endif
@@ -348,12 +350,32 @@ Function .onInit
348
350
MessageBoxMB_OK|MB_ICONSTOP'This is the 64-bit ${APP_NAME} installer.$\nPlease download the 32-bit version from ${WEBSITE}.$\n$\nClick Ok to quit Setup.'
349
351
Quit
350
352
${Endif}
353
+
354
+
; x64 will run in emulation on ARM64
355
+
${If}${IsNativeARM64}
356
+
MessageBoxMB_YESNO|MB_ICONEXCLAMATION|MB_DEFBUTTON2'There is a specific ARM64 ${APP_NAME} version available for download. Please consider installing the ARM64 version instead.$\nFor details visit ${WEBSITE}.$\nProceed with x64 installation anyway?' /SD IDYESIDYES noprobx64arm
357
+
Quit
358
+
noprobx64arm:
359
+
${Endif}
360
+
!else ifdef arm64
361
+
SetRegView64
362
+
${IfNot}${IsNativeARM64}
363
+
MessageBoxMB_OK|MB_ICONSTOP'This is the ARM64 ${APP_NAME} installer.$\nPlease download the x86 or x64 version from ${WEBSITE}.$\n$\nClick Ok to quit Setup.'
364
+
Quit
365
+
${Endif}
351
366
!else
352
-
${If}${RunningX64}
353
-
MessageBoxMB_YESNO|MB_ICONEXCLAMATION|MB_DEFBUTTON2'There is a specific 64-bit ${APP_NAME} version available for download. Please consider installing the 64-bit version instead.$\nFor details visit ${WEBSITE}.$\nProceed with 32-bit installation anyway?' /SD IDYESIDYES noprob
367
+
; x86 will run in emulation on ARM64
368
+
${If}${IsNativeARM64}
369
+
MessageBoxMB_YESNO|MB_ICONEXCLAMATION|MB_DEFBUTTON2'There is a specific ARM64 ${APP_NAME} version available for download. Please consider installing the ARM64 version instead.$\nFor details visit ${WEBSITE}.$\nProceed with x86 installation anyway?' /SD IDYESIDYES noprobx86arm
354
370
Quit
355
-
noprob:
356
-
${Endif}
371
+
noprobx86arm:
372
+
${Else}
373
+
${If}${RunningX64}
374
+
MessageBoxMB_YESNO|MB_ICONEXCLAMATION|MB_DEFBUTTON2'There is a specific 64-bit ${APP_NAME} version available for download. Please consider installing the 64-bit version instead.$\nFor details visit ${WEBSITE}.$\nProceed with 32-bit installation anyway?' /SD IDYESIDYES noprobx86x64
0 commit comments