From d5ac2a853bb95810b5c0ab5ce5f3c5761775bb4f Mon Sep 17 00:00:00 2001 From: Rafael Kitover Date: Sat, 29 Mar 2025 19:40:59 +0000 Subject: [PATCH] Revert "Update Link SFML usage to SFML 3.x APIs" This reverts commit e82ae7bb131d55382f80786c43020ea840b9cfab. Sorry, somehow I pushed to the wrong branch. --- cmake/Options.cmake | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmake/Options.cmake b/cmake/Options.cmake index 806ab3b0..1c6ab427 100644 --- a/cmake/Options.cmake +++ b/cmake/Options.cmake @@ -71,7 +71,7 @@ find_package(PkgConfig) if(TRANSLATIONS_ONLY) set(ENABLE_LINK_DEFAULT OFF) else() - find_package(SFML 3.0 COMPONENTS network system) + find_package(SFML 2.4 COMPONENTS network system) set(ENABLE_LINK_DEFAULT OFF) if(SFML_FOUND) set(ENABLE_LINK_DEFAULT ON) @@ -79,6 +79,11 @@ else() endif() option(ENABLE_LINK "Enable GBA linking functionality (BROKEN)" ${ENABLE_LINK_DEFAULT}) +if(ENABLE_LINK) + # Always disable link for now as SFML 2 is broken and we don't have a replacement yet. + set(ENABLE_LINK OFF CACHE BOOL "Enable GBA linking functionality (BROKEN)" FORCE) +endif() + # FFMpeg set(FFMPEG_DEFAULT OFF) set(FFMPEG_COMPONENTS AVCODEC AVFORMAT SWSCALE AVUTIL SWRESAMPLE)