From 93d4a44d3dac955b9d1d621969f65723ac1b2df4 Mon Sep 17 00:00:00 2001 From: takase1121 <20792268+takase1121@users.noreply.github.com> Date: Fri, 8 Dec 2023 22:39:03 +0800 Subject: [PATCH 1/2] sdl2: disable unity builds --- subprojects/packagefiles/sdl2/meson.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/subprojects/packagefiles/sdl2/meson.build b/subprojects/packagefiles/sdl2/meson.build index 1ef036716..94e6f09be 100644 --- a/subprojects/packagefiles/sdl2/meson.build +++ b/subprojects/packagefiles/sdl2/meson.build @@ -1177,7 +1177,7 @@ sdl2 = library('sdl2', c_args : core_args, link_args : core_ldflags, dependencies : deps, - override_options : ['c_std=none'], + override_options : ['c_std=none', 'unity=off'], install : do_install, gnu_symbol_visibility: 'hidden', ) @@ -1207,7 +1207,7 @@ sdl2_test = static_library('sdl2_test', c_args : core_args, link_args : core_ldflags, dependencies : [sdl2_dep, test_deps], - override_options : ['c_std=none'], + override_options : ['c_std=none', 'unity=off'], build_by_default : false, ) From db94a74798a4c8bf26529d399e1d3edf45a92544 Mon Sep 17 00:00:00 2001 From: takase1121 <20792268+takase1121@users.noreply.github.com> Date: Sat, 9 Dec 2023 20:35:23 +0800 Subject: [PATCH 2/2] sdl2: remove unity=off from sdl2_test --- subprojects/packagefiles/sdl2/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/packagefiles/sdl2/meson.build b/subprojects/packagefiles/sdl2/meson.build index 94e6f09be..430e77657 100644 --- a/subprojects/packagefiles/sdl2/meson.build +++ b/subprojects/packagefiles/sdl2/meson.build @@ -1207,7 +1207,7 @@ sdl2_test = static_library('sdl2_test', c_args : core_args, link_args : core_ldflags, dependencies : [sdl2_dep, test_deps], - override_options : ['c_std=none', 'unity=off'], + override_options : ['c_std=none'], build_by_default : false, )