From 5c3e73e1fc553ee723d40ddfc2a6bce82fb3fc1c Mon Sep 17 00:00:00 2001 From: Ryan Lucia Date: Wed, 7 Oct 2026 21:53:33 -0700 Subject: [PATCH] meson: stop compiling the generated resources twice The aegisub executable listed the generated bitmap.cpp and default_config.cpp in its sources even though libresrc, which it links, already compiles them. Only pass the generated headers, which aegisub needs for build ordering. Co-Authored-By: Claude Opus 5.5 --- meson.build | 2 +- src/libresrc/meson.build | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index 29b7fd390c..c97825998d 100644 --- a/meson.build +++ b/meson.build @@ -563,7 +563,7 @@ if host_machine.system() == 'windows' link_depends += manifest_file endif -aegisub = executable('aegisub', aegisub_src, version_h, resrc, aegisub_order_dep, +aegisub = executable('aegisub', aegisub_src, version_h, libresrc_headers, aegisub_order_dep, c_args: aegisub_defines, cpp_args: aegisub_defines, link_with: [libresrc, libaegisub], diff --git a/src/libresrc/meson.build b/src/libresrc/meson.build index 3b9c4563cd..0ff255f435 100644 --- a/src/libresrc/meson.build +++ b/src/libresrc/meson.build @@ -100,4 +100,6 @@ resrc += custom_target('default_config.{cpp,h}', libresrc_inc = include_directories('.') +# Only the generated headers; libresrc compiles the generated sources +libresrc_headers = [resrc[0][1], resrc[1][1]] libresrc = static_library('resrc', 'libresrc.cpp', resrc, dependencies: deps)