Merge pull request #987 from cjee21/NSIS

Windows GUI: Ensure correct installers are used for each system
MediaArea · Dec 6, 2024 · 70015ea · 70015ea
2 parents 689454c + 72f51e2
commit 70015ea
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/Source/Install/MediaInfo_GUI_Windows_i386.nsi b/Source/Install/MediaInfo_GUI_Windows_i386.nsi
@@ -19,6 +19,9 @@ RequestExecutionLevel admin
 ; Compression
 SetCompressor /FINAL /SOLID lzma
 
+; x64 stuff
+!include "x64.nsh"
+
 ; Library macros for handling install/uninstall of exe/dll
 ; https://nsis.sourceforge.io/Docs/AppendixB.html
 !include "Library.nsh"
@@ -117,6 +120,14 @@ ShowInstDetails nevershow
 ShowUnInstDetails nevershow
 
 Function .onInit
+  ${If} ${AtLeastWin11}
+    MessageBox mb_iconStop "Windows not i386!"
+    Abort
+  ${EndIf}
+  ${If} ${IsNativeAMD64}
+    MessageBox mb_iconStop "Windows not i386!"
+    Abort
+  ${EndIf}
   !insertmacro MUI_LANGDLL_DISPLAY
 
   ; Increment install count

diff --git a/Source/Install/MediaInfo_GUI_Windows_x64.nsi b/Source/Install/MediaInfo_GUI_Windows_x64.nsi
@@ -120,10 +120,10 @@ ShowInstDetails nevershow
 ShowUnInstDetails nevershow
 
 Function .onInit
-  ${If} ${RunningX64}
+  ${If} ${IsNativeAMD64}
     SetRegView 64
   ${Else}
-    MessageBox mb_iconStop "Windows not 64-bit!"
+    MessageBox mb_iconStop "Windows not x64!"
     Abort
   ${EndIf}
   !insertmacro MUI_LANGDLL_DISPLAY
@@ -142,7 +142,7 @@ Section "SectionPrincipale" SEC01
   File "/oname=History.txt" "..\..\History_GUI.txt"
   File "..\..\License.html"
   File "/oname=ReadMe.txt" "..\..\Release\ReadMe_GUI_Windows.txt"
-  ; ${If} ${RunningX64}
+  ; ${If} ${IsNativeAMD64}
     File "/oname=MediaInfo.exe" "..\..\Project\BCB\GUI\Win64\Release\MediaInfo_GUI.exe"
     File "..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo_InfoTip.dll"
     File "..\..\..\MediaInfoLib\Project\MSVC2022\x64\Release\MediaInfo.dll"