Leahnaya/pokeplatinum
1
0
Fork 0
mirror of https://github.com/pret/pokeplatinum.git synced 2026-03-21 17:55:13 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix the dependency chain for the area data generator (#967)
Some checks are pending
build / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
Rachel 2026-02-22 14:30:17 -08:00 committed by GitHub
parent 5b37fec40b
commit 3cee58041c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
res/field/area_data/meson.build
View File

@ -1,7 +1,14 @@
area_data_deps = [
prop_model_set_narc[0],
map_texture_set_narc[0],
lighting_narc[0],
]
area_data_bin_gen = generator(
area_data_py,
arguments: [ '@INPUT@', '@OUTPUT@', '@EXTRA_ARGS@', ],
output: '@BASENAME@'
output: '@BASENAME@',
depends: [ py_consts_generators, area_data_deps ],
)
area_data_srcs = files(
@ -84,19 +91,13 @@ area_data_srcs = files(
area_data_order = files('area_data.order')
area_data_deps = [
prop_model_set_narc,
map_texture_set_narc,
lighting_narc
]
area_data_narc = custom_target('area_data.narc',
output: [
'area_data.narc',
'area_data.naix',
],
input: [
area_data_bin_gen.process(area_data_srcs,
area_data_bin_gen.process(area_data_srcs,
env: jsoncnv_env,
extra_args: [
'--map-prop-set-naix', prop_model_set_narc[1].full_path() + '.h',
@ -106,10 +107,7 @@ area_data_narc = custom_target('area_data.narc',
),
area_data_order,
],
depends: [
py_consts_generators,
area_data_deps
],
depends: py_consts_generators,
command: [
narc_exe, 'create',
'--naix',

2
res/field/maps/texture_sets/meson.build
View File

@ -1,4 +1,4 @@
map_texture_set_gen = generator(find_program('cp'),
map_texture_set_gen = generator(copy_exe,
arguments: [ '@INPUT@', '@OUTPUT@', ],
output: '@BASENAME@'
)

2
res/meson.build
View File

@ -66,7 +66,7 @@ lz_gen = generator(nitrogfx_exe,
output: '@PLAINNAME@.lz',
)
copy_gen = generator(find_program('cp'),
copy_gen = generator(copy_exe,
arguments: [ '@INPUT@', '@OUTPUT@', ],
output: '@PLAINNAME@'
)

2
tools/meson.build
View File

@ -12,6 +12,8 @@ subdir('postconf')
subdir('scripts')
subdir('debug')
copy_exe = find_program('cp')
# ARM binutils
arm_none_eabi_gcc_exe = find_program('arm-none-eabi-gcc', native: true)
arm_none_eabi_objcopy_exe = find_program('arm-none-eabi-objcopy', native: true)