use x64 build in Windows 11 ARM64 system

fxliang · Mar 4, 2024 · 97ab0f2 · 97ab0f2
1 parent 36c35ea
commit 97ab0f2
Showing 1 changed file with 32 additions and 11 deletions.
diff --git a/output/install.nsi b/output/install.nsi
@@ -3,6 +3,7 @@
 !include LogicLib.nsh
 !include MUI2.nsh
 !include x64.nsh
+!include winVer.nsh
 
 Unicode true
 
@@ -207,17 +208,37 @@ program_files:
     File /nonfatal "weaseltARM.ime"
     File /nonfatal "weaseltARM64.ime"
   ${EndIf}
-  ${If} ${IsNativeAMD64}
-		File "WeaselDeployer.exe"
-		File "WeaselServer.exe"
-		File "rime.dll"
-		File "WinSparkle.dll"
-	${Else}
-		File "Win32\WeaselDeployer.exe"
-		File "Win32\WeaselServer.exe"
-		File "Win32\rime.dll"
-		File "Win32\WinSparkle.dll"
-  ${EndIf}
+
+  ${If} ${AtLeastWin11} ; Windows 11 and above
+    ${If} ${IsNativeARM64}
+      File "WeaselDeployer.exe"
+      File "WeaselServer.exe"
+      File "rime.dll"
+      File "WinSparkle.dll"
+    ${ElseIf} ${IsNativeAMD64}
+      File "WeaselDeployer.exe"
+      File "WeaselServer.exe"
+      File "rime.dll"
+      File "WinSparkle.dll"
+    ${Else}
+      File "Win32\WeaselDeployer.exe"
+      File "Win32\WeaselServer.exe"
+      File "Win32\rime.dll"
+      File "Win32\WinSparkle.dll"
+    ${Endif}
+  ${Else} ; Windows 10 or bellow
+    ${If} ${IsNativeAMD64}
+      File "WeaselDeployer.exe"
+      File "WeaselServer.exe"
+      File "rime.dll"
+      File "WinSparkle.dll"
+    ${Else}
+      File "Win32\WeaselDeployer.exe"
+      File "Win32\WeaselServer.exe"
+      File "Win32\rime.dll"
+      File "Win32\WinSparkle.dll"
+    ${Endif}
+  ${Endif}
   File "WeaselSetup.exe"
   ; shared data files
   SetOutPath $INSTDIR\data