Skip to content

Commit 42634c6

Browse files
committed
check for 64bit, add wii/gamecube selection
1 parent edf57df commit 42634c6

2 files changed

Lines changed: 36 additions & 4 deletions

File tree

nsis/INIfiles/devkitProUpdate.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[devkitProUpdate]
2-
Build=53
2+
Build=54
33
URL=http://downloads.devkitpro.org
4-
Filename=devkitProUpdater-3.0.0.exe
4+
Filename=devkitProUpdater-3.0.1.exe
55

66
[msys2]
77
Version=2.10.0

nsis/devkitPro.nsi

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ RequestExecutionLevel admin ;Require admin rights on NT6+ (When UAC is turned on
1515

1616
; HM NIS Edit Wizard helper defines
1717
!define PRODUCT_NAME "devkitProUpdater"
18-
!define PRODUCT_VERSION "3.0.0"
18+
!define PRODUCT_VERSION "3.0.1"
1919
!define PRODUCT_PUBLISHER "devkitPro"
2020
!define PRODUCT_WEB_SITE "http://www.devkitpro.org"
2121
!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
2222
!define PRODUCT_UNINST_ROOT_KEY "HKLM"
2323
!define PRODUCT_STARTMENU_REGVAL "NSIS:StartMenuDir"
24-
!define BUILD "53"
24+
!define BUILD "54"
2525

2626
SetCompressor /SOLID lzma
2727

@@ -32,6 +32,8 @@ SetCompressor /SOLID lzma
3232
!include "InstallOptions.nsh"
3333
!include "ReplaceInFile.nsh"
3434
!include "NTProfiles.nsh"
35+
!include LogicLib.nsh
36+
!include x64.nsh
3537

3638
;${StrTok}
3739
${StrRep}
@@ -182,6 +184,10 @@ Section "NDS Development" SecNDSDev
182184
SectionEnd
183185
Section "3DS Development" Sec3DSDev
184186
SectionEnd
187+
Section "Gamecube Development" SecGameCubeDev
188+
SectionEnd
189+
Section "Wii Development" SecWiiDev
190+
SectionEnd
185191

186192
Section -installComponents
187193

@@ -273,6 +279,16 @@ SkipMsys:
273279
push ${Sec3DSDev}
274280
call updateGroup
275281

282+
push "GameCubeDev"
283+
push "gamecube-dev"
284+
push ${SecGameCubeDev}
285+
call updateGroup
286+
287+
push "WiiDev"
288+
push "wii-dev"
289+
push ${SecWiiDev}
290+
call updateGroup
291+
276292
push "SwitchDev"
277293
push "switch-dev"
278294
push ${SecSwitchDev}
@@ -374,6 +390,14 @@ var mirrorINI
374390
;-----------------------------------------------------------------------------------------------------------------------
375391
Function .onInit
376392
;-----------------------------------------------------------------------------------------------------------------------
393+
394+
${If} ${RunningX64}
395+
${Else}
396+
MessageBox mb_IconStop|mb_TopMost|mb_SetForeground "Sorry, this installer only supports 64 bit."
397+
Quit
398+
${EndIf}
399+
400+
377401
; test existing ini file version
378402
; if lower than build then use built in ini
379403
ifFileExists $EXEDIR\devkitProUpdate.ini +1 extractINI
@@ -484,6 +508,14 @@ installing:
484508
push ${SecSwitchDev}
485509
call checkEnabled
486510

511+
push "SwitchDev"
512+
push ${SecSwitchDev}
513+
call checkEnabled
514+
515+
push "SwitchDev"
516+
push ${SecSwitchDev}
517+
call checkEnabled
518+
487519
first_install:
488520

489521
FunctionEnd

0 commit comments

Comments
 (0)