RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:47:45 +00:00
Code Issues Activity Actions

Ports: Reapply the SDL2_sound patch

Browse source
This commit is contained in:
Tim Schumacher 2023-04-09 00:25:51 +02:00 • committed by Jelle Raaijmakers
parent f532f9d279
commit 56fdbf81dc
1 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Ports/SDL2_sound/patches/0001-Use-pkgconfig-to-find-SDL2.patch
View file

@ -4,22 +4,20 @@ Date: Sun, 19 Sep 2021 22:46:10 +0300
Subject: [PATCH] Use pkgconfig to find SDL2 Subject: [PATCH] Use pkgconfig to find SDL2
--- ---
CMakeLists.txt | 5 ++++- CMakeLists.txt | 3 ++-
1 file changed, 4 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1b9241..a659246 100644 index 4aac4777ea9c0e95c522bff5be1701306a3a24e5..1610408d2d284fda6918a6dc9b5bc1249acab17d 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -24,7 +24,10 @@ if(CMAKE_C_COMPILER_ID STREQUAL "SunPro") @@ -30,7 +30,8 @@ if(CMAKE_C_COMPILER_ID STREQUAL "SunPro")
add_definitions(-xldscope=hidden) add_compile_options(-xldscope=hidden)
endif() endif()
-find_package(SDL2 REQUIRED) -find_package(SDL2 REQUIRED)
+INCLUDE(FindPkgConfig) +INCLUDE(FindPkgConfig)
+
+PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2) +PKG_SEARCH_MODULE(SDL2 REQUIRED sdl2)
+
include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_INCLUDE_DIR})
if(WIN32) if(WIN32)
# -lmingw32: gcc adds it automatically. # -lmingw32: gcc adds it automatically.
# -mwindows: doesn't make sense.