Clean up SDL related CMakeLists.txt by using pkgconf

pspdev · Feb 18, 2024 · 9510f39 · 9510f39
1 parent ac8b4fb
commit 9510f39
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 22 deletions.
diff --git a/_includes/samples/sdl2/CMakeLists.txt b/_includes/samples/sdl2/CMakeLists.txt
@@ -4,7 +4,8 @@ project(sdl2)
 
 add_executable(${PROJECT_NAME} main.c)
 
-find_package(SDL2 REQUIRED)
+include(FindPkgConfig)
+pkg_search_module(SDL2 REQUIRED sdl2)
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})
 

diff --git a/_includes/samples/sdl2_mixer/CMakeLists.txt b/_includes/samples/sdl2_mixer/CMakeLists.txt
@@ -4,23 +4,21 @@ project(sdl2_mixer)
 
 add_executable(${PROJECT_NAME} main.c)
 
-find_package(SDL2 REQUIRED)
+include(FindPkgConfig)
+pkg_search_module(SDL2 REQUIRED sdl2)
+pkg_search_module(SDL2_MIXER REQUIRED SDL2_mixer)
 
-target_include_directories(${PROJECT_NAME} PRIVATE ${SDL2_INCLUDE_DIRS})
+target_include_directories(${PROJECT_NAME} PRIVATE
+    ${SDL2_INCLUDE_DIRS}
+    ${SDL2_MIXER_INCLUDE_DIRS}
+)
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
     ${SDL2_LIBRARIES}
+    ${SDL2_MIXER_LIBRARIES}
 )
 
 if(PSP)
-    target_link_libraries(${PROJECT_NAME} PRIVATE
-        SDL2_mixer
-        SDL2
-        vorbisfile
-        vorbis
-        ogg
-        xmp
-    )
     create_pbp_file(
         TARGET ${PROJECT_NAME}
         ICON_PATH NULL

diff --git a/_includes/samples/sdl2_ttf/CMakeLists.txt b/_includes/samples/sdl2_ttf/CMakeLists.txt
@@ -4,25 +4,21 @@ project(sdl2_ttf)
 
 add_executable(${PROJECT_NAME} main.c)
 
-find_package(SDL2 REQUIRED)
+include(FindPkgConfig)
+pkg_search_module(SDL2 REQUIRED sdl2)
+pkg_search_module(SDL2_TTF REQUIRED SDL2_ttf)
 
-target_include_directories(${PROJECT_NAME} 
-    PRIVATE ${SDL2_INCLUDE_DIRS}
+target_include_directories(${PROJECT_NAME} PRIVATE
+    ${SDL2_INCLUDE_DIRS}
+    ${SDL2_TTF_INCLUDE_DIRS}
 )
 
 target_link_libraries(${PROJECT_NAME} PRIVATE
     ${SDL2_LIBRARIES}
+    ${SDL2_TTF_LIBRARIES}
 )
 
 if(PSP)
-    target_link_libraries(${PROJECT_NAME} PRIVATE
-        SDL2_ttf
-        freetype
-        m
-        bz2
-        png16
-        z
-    )
     create_pbp_file(
         TARGET ${PROJECT_NAME}
         ICON_PATH NULL