diff --git a/res/field/area_data/meson.build b/res/field/area_data/meson.build index 8751e8b98a..8f1f90504e 100644 --- a/res/field/area_data/meson.build +++ b/res/field/area_data/meson.build @@ -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', diff --git a/res/field/maps/texture_sets/meson.build b/res/field/maps/texture_sets/meson.build index 8106715dcb..0bd3b7924f 100644 --- a/res/field/maps/texture_sets/meson.build +++ b/res/field/maps/texture_sets/meson.build @@ -1,4 +1,4 @@ -map_texture_set_gen = generator(find_program('cp'), +map_texture_set_gen = generator(copy_exe, arguments: [ '@INPUT@', '@OUTPUT@', ], output: '@BASENAME@' ) diff --git a/res/meson.build b/res/meson.build index 885a78ef86..b29ad308e0 100644 --- a/res/meson.build +++ b/res/meson.build @@ -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@' ) diff --git a/tools/meson.build b/tools/meson.build index efa23d7ca0..edc8ab505a 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -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)