ags/ags-use-system-libraries.patch
Dominik 'Rathann' Mierzejewski 4a3393a565 follow upstream convention in option naming
- drop custom miniz detection and require a fixed build instead
2025-08-03 01:02:07 +02:00

60 lines
2.7 KiB
Diff

diff -up ags-3.6.2.12/CMake/FindLocalOpenAL.cmake.orig ags-3.6.2.12/CMake/FindLocalOpenAL.cmake
--- ags-3.6.2.12/CMake/FindLocalOpenAL.cmake.orig 2025-07-18 23:24:38.000000000 +0200
+++ ags-3.6.2.12/CMake/FindLocalOpenAL.cmake 2025-07-19 14:03:42.772659440 +0200
@@ -1,6 +1,6 @@
# Grab system openAL or use embedded mojoAL
-if(WIN32 OR LINUX OR MACOS OR FREEBSD)
+if(WIN32 OR MACOS OR FREEBSD)
set(AGS_USE_MOJO_AL TRUE)
endif()
diff -up ags-3.6.2.12/CMakeLists.txt.orig ags-3.6.2.12/CMakeLists.txt
--- ags-3.6.2.12/CMakeLists.txt.orig 2025-07-18 23:24:38.000000000 +0200
+++ ags-3.6.2.12/CMakeLists.txt 2025-07-20 13:18:35.622533999 +0200
@@ -18,6 +18,9 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PAT
option(AGS_USE_LOCAL_ALL_LIBRARIES "Use a locally installed libraries" OFF)
option(AGS_USE_LOCAL_SDL2 "Use a locally installed SDL2" ${AGS_USE_LOCAL_ALL_LIBRARIES})
option(AGS_USE_LOCAL_SDL2_SOUND "Use a locally installed SDL2 Sound" ${AGS_USE_LOCAL_ALL_LIBRARIES})
+option(AGS_USE_LOCAL_GLM "Use a locally installed GLM" ${AGS_USE_LOCAL_ALL_LIBRARIES})
+option(AGS_USE_LOCAL_MINIZ "Use a locally installed Miniz" ${AGS_USE_LOCAL_ALL_LIBRARIES})
+option(AGS_USE_LOCAL_TINYXML "Use a locally installed TinyXML" ${AGS_USE_LOCAL_ALL_LIBRARIES})
option(AGS_USE_LOCAL_OGG "Use a locally installed OGG" ${AGS_USE_LOCAL_ALL_LIBRARIES})
option(AGS_USE_LOCAL_THEORA "Use a locally installed Theora" ${AGS_USE_LOCAL_ALL_LIBRARIES})
option(AGS_USE_LOCAL_VORBIS "Use a locally installed Vorbis" ${AGS_USE_LOCAL_ALL_LIBRARIES})
@@ -313,9 +316,22 @@ endif()
include(FindLocalOpenAL)
include(FindLocalAllegro)
+if (NOT AGS_USE_LOCAL_GLM)
add_subdirectory(libsrc/glm EXCLUDE_FROM_ALL)
+else()
+ find_package(glm REQUIRED)
+endif()
+if (NOT AGS_USE_LOCAL_TINYXML2)
add_subdirectory(libsrc/tinyxml2 EXCLUDE_FROM_ALL)
+else()
+ find_package(tinyxml2 REQUIRED)
+endif()
+if (NOT AGS_USE_LOCAL_MINIZ)
add_subdirectory(libsrc/miniz EXCLUDE_FROM_ALL)
+else()
+ find_package(miniz REQUIRED)
+ add_library(MiniZ::MiniZ ALIAS miniz::miniz)
+endif()
add_subdirectory(Common/libsrc/aastr-0.1.1 EXCLUDE_FROM_ALL)
diff -up ags-3.6.2.12/CMAKE.md.orig ags-3.6.2.12/CMAKE.md
--- ags-3.6.2.12/CMAKE.md.orig 2025-07-18 23:24:38.000000000 +0200
+++ ags-3.6.2.12/CMAKE.md 2025-07-20 13:16:13.775985811 +0200
@@ -97,6 +97,9 @@ The available flags are:
- `AGS_USE_LOCAL_SDL2` : Find SDL2 locally
- `AGS_USE_LOCAL_SDL2_SOUND` : Find SDL sound locally
+- `AGS_USE_LOCAL_GLM` : Find GLM locally
+- `AGS_USE_LOCAL_MINIZ` : Find Miniz locally
+- `AGS_USE_LOCAL_TINYXML` : Find TinyXML locally
- `AGS_USE_LOCAL_OGG` : Find OGG locally
- `AGS_USE_LOCAL_THEORA` : Find Theora locally
- `AGS_USE_LOCAL_VORBIS` : Find Vorbis locally