Skip to content

Commit 3728537

Browse files
committed
3ds: use hardcoded values from meson, instead of from the cross files
1 parent 2aea318 commit 3728537

File tree

3 files changed

+15
-21
lines changed

3 files changed

+15
-21
lines changed

meson.build

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ project(
1616

1717
oopetris_author = 'Coder2k'
1818
oopetris_name = 'OOPetris'
19+
oopetris_desc = 'A Tetris clone in OOP'
1920

2021
subdir('tools/options')
2122

@@ -52,6 +53,13 @@ if meson.is_cross_build()
5253
[liboopetris_graphics_dep, graphic_application_deps],
5354
]
5455
subdir('platforms/3ds')
56+
elif host_machine.system() == 'wii'
57+
wii_options = [
58+
app_name,
59+
main_files,
60+
[liboopetris_graphics_dep, graphic_application_deps],
61+
]
62+
subdir('platforms/wii')
5563
else
5664
error('not supported platform: ' + host_machine.system())
5765
endif

platforms/3ds/meson.build

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -84,23 +84,13 @@ fs = import('fs')
8484
if use_smdh
8585

8686
smdhtool = find_program('smdhtool')
87-
SMDH_FLAGS = [smdhtool, '--create']
88-
89-
APP_NAME = meson.get_external_property('APP_NAME', _3ds_exe_name)
90-
SMDH_FLAGS += APP_NAME
91-
92-
APP_DESC = meson.get_external_property('APP_DESC', '')
93-
if APP_DESC == ''
94-
error('If USE_SMDH is set, you have to provide an APP_DESC')
95-
endif
96-
SMDH_FLAGS += APP_DESC
97-
98-
99-
APP_AUTHOR = meson.get_external_property('APP_AUTHOR', '')
100-
if APP_AUTHOR == ''
101-
error('If USE_SMDH is set, you have to provide an APP_AUTHOR')
102-
endif
103-
SMDH_FLAGS += APP_AUTHOR
87+
SMDH_FLAGS = [
88+
smdhtool,
89+
'--create',
90+
oopetris_name,
91+
oopetris_desc,
92+
oopetris_author,
93+
]
10494

10595
LIBCTRU = meson.get_external_property('libctru', '')
10696
if LIBCTRU == ''

platforms/build-3ds.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,6 @@ needs_exe_wrapper = true
103103
library_dirs= ['$LIBCTRU_LIB','$PORTLIBS_LIB']
104104
libctru='$LIBCTRU'
105105
106-
APP_NAME = 'oopetris'
107-
APP_AUTHOR = 'coder2k'
108-
APP_DESC = 'A Tetris clone in OOP'
109-
110106
USE_SMDH = true
111107
112108
APP_ROMFS='$ROMFS'

0 commit comments

Comments
 (0)