check for 64bit, add wii/gamecube selection

devkitPro · May 23, 2018 · 42634c6 · 42634c6
1 parent edf57df
commit 42634c6
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 4 deletions.
diff --git a/nsis/INIfiles/devkitProUpdate.ini b/nsis/INIfiles/devkitProUpdate.ini
@@ -1,7 +1,7 @@
 [devkitProUpdate]
-Build=53
+Build=54
 URL=http://downloads.devkitpro.org
-Filename=devkitProUpdater-3.0.0.exe
+Filename=devkitProUpdater-3.0.1.exe
 
 [msys2]
 Version=2.10.0

diff --git a/nsis/devkitPro.nsi b/nsis/devkitPro.nsi
@@ -15,13 +15,13 @@ RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned on
 
 ; HM NIS Edit Wizard helper defines
 !define PRODUCT_NAME "devkitProUpdater"
-!define PRODUCT_VERSION "3.0.0"
+!define PRODUCT_VERSION "3.0.1"
 !define PRODUCT_PUBLISHER "devkitPro"
 !define PRODUCT_WEB_SITE "http://www.devkitpro.org"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
 !define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"
-!define BUILD "53"
+!define BUILD "54"
 
 SetCompressor /SOLID lzma
 
@@ -32,6 +32,8 @@ SetCompressor /SOLID lzma
 !include "InstallOptions.nsh"
 !include "ReplaceInFile.nsh"
 !include "NTProfiles.nsh"
+!include LogicLib.nsh
+!include x64.nsh
 
 ;${StrTok}
 ${StrRep}
@@ -182,6 +184,10 @@ Section "NDS Development" SecNDSDev
 SectionEnd
 Section "3DS Development" Sec3DSDev
 SectionEnd
+Section "Gamecube Development" SecGameCubeDev
+SectionEnd
+Section "Wii Development" SecWiiDev
+SectionEnd
 
 Section -installComponents
 
@@ -273,6 +279,16 @@ SkipMsys:
   push ${Sec3DSDev}
   call updateGroup
 
+  push "GameCubeDev"
+  push "gamecube-dev"
+  push ${SecGameCubeDev}
+  call updateGroup
+
+  push "WiiDev"
+  push "wii-dev"
+  push ${SecWiiDev}
+  call updateGroup
+
   push "SwitchDev"
   push "switch-dev"
   push ${SecSwitchDev}
@@ -374,6 +390,14 @@ var mirrorINI
 ;-----------------------------------------------------------------------------------------------------------------------
 Function .onInit
 ;-----------------------------------------------------------------------------------------------------------------------
+
+${If} ${RunningX64}
+${Else}
+  MessageBox mb_IconStop|mb_TopMost|mb_SetForeground "Sorry, this installer only supports 64 bit."
+  Quit
+${EndIf}  
+
+
   ; test existing ini file version
   ; if lower than build then use built in ini
   ifFileExists $EXEDIR\devkitProUpdate.ini +1 extractINI
@@ -484,6 +508,14 @@ installing:
   push ${SecSwitchDev}
   call checkEnabled
 
+  push "SwitchDev"
+  push ${SecSwitchDev}
+  call checkEnabled
+
+  push "SwitchDev"
+  push ${SecSwitchDev}
+  call checkEnabled
+
 first_install:
 
 FunctionEnd