From a2b99b09b54c03af9c627875bfa069818ce1663d Mon Sep 17 00:00:00 2001 From: LibretroAdmin Date: Sat, 26 Sep 2026 22:01:59 +0000 Subject: [PATCH] build: link video_mode_select on every Linux build, not just Wayland 06aed75 made mutter_displayconfig.c call video_mode_list_finish but only added gfx/common/video_mode_select.o under HAVE_WAYLAND, so every Linux build without Wayland (the plain Linux job and linux-c89) failed at link time with an undefined reference from mutter_displayconfig_get_resolution_list. video_mode_select.c is plain C with no platform dependency, so it goes in the base object list next to video_driver.o, and the same include moves next to video_driver.c in griffin. --- Makefile.common | 2 +- griffin/griffin.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.common b/Makefile.common index 86fb36c7c4..8985d37695 100644 --- a/Makefile.common +++ b/Makefile.common @@ -330,6 +330,7 @@ OBJ += \ input/common/input_hid_common.o \ led/led_driver.o \ gfx/video_driver.o \ + gfx/common/video_mode_select.o \ gfx/gfx_display.o \ gfx/gfx_animation.o \ gfx/gfx_instrument.o \ @@ -1352,7 +1353,6 @@ ifeq ($(HAVE_WAYLAND), 1) gfx/common/wayland_color.o \ gfx/common/wayland/kde-output-device-v2.o \ gfx/common/wayland/kde-output-management-v2.o \ - gfx/common/video_mode_select.o \ gfx/common/wayland_kwin_output.o \ gfx/common/wayland/wlr-output-management-unstable-v1.o \ gfx/common/wayland_wlr_output.o \ diff --git a/griffin/griffin.c b/griffin/griffin.c index 055c021520..b47c0eb9cf 100644 --- a/griffin/griffin.c +++ b/griffin/griffin.c @@ -280,6 +280,7 @@ CHEATS #include "../libretro-common/hash/lrc_hash.c" #include "../gfx/video_driver.c" +#include "../gfx/common/video_mode_select.c" /*============================================================ UI COMMON CONTEXT ============================================================ */ @@ -1475,7 +1476,6 @@ THREAD || defined(__OpenBSD__) || defined(__NetBSD__) #include "../gfx/common/dbus_runtime.c" #include "../gfx/common/dbus_common.c" -#include "../gfx/common/video_mode_select.c" #include "../gfx/common/mutter_displayconfig.c" #include "../frontend/thread_elevation/rtkit.c" #include "../frontend/thread_elevation/eevdf.c"