Skip to content

Commit

Permalink
Give full ROM builds a proper feature option
Browse files Browse the repository at this point in the history
Co-authored-by: Dusk Banks <[email protected]>
  • Loading branch information
9ary and bb010g committed Dec 4, 2023
1 parent 654dfd4 commit 729bfb0
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/continuous-integration-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
- name: Build iplboot
run: |
export PATH="$DEVKITPPC/bin:$PATH"
meson setup . build --cross-file=devkitPPC.ini
meson setup . build --cross-file=devkitPPC.ini -Dfull_rom='enabled'
ninja -C build
- name: Upload build artifacts
Expand Down
4 changes: 1 addition & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ foreach name, exe: dols
dols += {name: dol}
endforeach

if ipl_rom.length() != 0
if full_rom_opt.allowed()
qoob_pro = custom_target(
'qoob_pro',
input: [dols['iplboot'], ipl_rom],
Expand All @@ -81,8 +81,6 @@ if ipl_rom.length() != 0
build_by_default: true,
)
alias_target('qoob_pro', qoob_pro)
else
warning('IPL ROM not found, building for Qoob Pro will not be possible!')
endif

sx_exe = compressed_exes['iplboot_sx']['compressed']
Expand Down
1 change: 1 addition & 0 deletions meson.options
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
option('full_rom', type: 'feature', description: 'Whether to enable full ROM builds (Qoob Pro support)')
19 changes: 15 additions & 4 deletions res/meson.build
Original file line number Diff line number Diff line change
@@ -1,9 +1,20 @@
fs = import('fs')

if fs.is_file('ipl.rom')
ipl_rom = files('ipl.rom')
else
ipl_rom = files()
ipl_rom_name = 'ipl.rom'
full_rom_opt = get_option('full_rom')
if full_rom_opt.allowed()
full_rom_opt = full_rom_opt.require(
fs.is_file(ipl_rom_name),
error_message: 'IPL ROM file @0@ not found, can\'t build Qoob Pro image!'.format(ipl_rom_name),
)
if full_rom_opt.allowed()
ipl_rom = files(ipl_rom_name)
endif
endif
summary(
'Qoob Pro support',
full_rom_opt.allowed(),
bool_yn: true,
)

qoob_sx_updater = files('qoob_sx_13c_upgrade.elf')

0 comments on commit 729bfb0

Please sign in to comment.