From 42c842ec55837e1a4b721c1dc268ab4effe75a5e Mon Sep 17 00:00:00 2001 From: Andrei Sabalenka Date: Thu, 5 Sep 2024 23:18:08 +0300 Subject: [PATCH 1/2] cmake: allow overriding GME_ZLIB and GME_UNRAR options by user --- CMakeLists.txt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34401114e..39f3fd11b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -701,8 +701,12 @@ if(SDLMIXER_GME) set(BUILD_SHARED_LIBS "${SDLMIXER_GME_SHARED}") set(ENABLE_UBSAN OFF) set(BUILD_FRAMEWORK OFF) - set(GME_ZLIB OFF) - set(GME_UNRAR OFF) + if(NOT DEFINED GME_ZLIB) + set(GME_ZLIB OFF) + endif() + if(NOT DEFINED GME_UNRAR) + set(GME_UNRAR OFF) + endif() message(STATUS "Using vendored libgme") sdl_check_project_in_subfolder(external/libgme libgme SDLMIXER_VENDORED) add_subdirectory(external/libgme EXCLUDE_FROM_ALL) From eb188f7629d10716b9f14ebc34d4574be452a8c8 Mon Sep 17 00:00:00 2001 From: Andrei Sabalenka Date: Fri, 6 Sep 2024 01:26:00 +0300 Subject: [PATCH 2/2] cmake: pass GME_ZLIB as function, remove GME_UNRAR --- CMakeLists.txt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 39f3fd11b..222cc85ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -701,12 +701,7 @@ if(SDLMIXER_GME) set(BUILD_SHARED_LIBS "${SDLMIXER_GME_SHARED}") set(ENABLE_UBSAN OFF) set(BUILD_FRAMEWORK OFF) - if(NOT DEFINED GME_ZLIB) - set(GME_ZLIB OFF) - endif() - if(NOT DEFINED GME_UNRAR) - set(GME_UNRAR OFF) - endif() + option(GME_ZLIB "Enable GME to support compressed sound formats" OFF) message(STATUS "Using vendored libgme") sdl_check_project_in_subfolder(external/libgme libgme SDLMIXER_VENDORED) add_subdirectory(external/libgme EXCLUDE_FROM_ALL)