Patch-Source: https://github.com/archlinux/svntogit-community/blob/300f36460d1b94f4378d7676dc420dfe7d78959f/trunk/ppsspp-system-zstd.patch diff '--color=auto' -rupN libretro-ppsspp.orig/CMakeLists.txt libretro-ppsspp/CMakeLists.txt --- libretro-ppsspp.orig/CMakeLists.txt 2021-10-01 17:28:30.046655852 +0200 +++ libretro-ppsspp/CMakeLists.txt 2021-10-01 17:30:38.698699237 +0200 @@ -151,6 +151,7 @@ option(USE_MINIUPNPC "Build with miniUPn option(USE_SYSTEM_SNAPPY "Dynamically link against system snappy" ${USE_SYSTEM_SNAPPY}) option(USE_SYSTEM_FFMPEG "Dynamically link against system FFMPEG" ${USE_SYSTEM_FFMPEG}) option(USE_SYSTEM_LIBZIP "Dynamically link against system libzip" ${USE_SYSTEM_LIBZIP}) +option(USE_SYSTEM_ZSTD "Dynamically link against system zstd" ${USE_SYSTEM_ZSTD}) option(USE_SYSTEM_LIBSDL2 "Dynamically link against system SDL2" ON) option(USE_SYSTEM_LIBPNG "Dynamically link against system libpng" ON) option(USE_ASAN "Use address sanitizer" OFF) @@ -1976,8 +1977,20 @@ if(ANDROID) endif() endif() -set(CoreExtraLibs ${CoreExtraLibs} armips libzstd_static) -include_directories(ext/zstd/lib) +set(CoreExtraLibs ${CoreExtraLibs} armips) + +find_package(PkgConfig) +if(PKG_CONFIG_FOUND) + pkg_check_modules(ZSTD libzstd) +endif() +if(ZSTD_FOUND AND USE_SYSTEM_ZSTD) + include_directories(${ZSTD_INCLUDE_DIRS}) + target_link_libraries(${CoreLibName} ${ZSTD_LIBRARIES}) +else() + add_subdirectory(ext/zstd/build/cmake EXCLUDE_FROM_ALL) + include_directories(ext/zstd/lib) + set(CoreExtraLibs ${CoreExtraLibs} libzstd_static) +endif() # needed for VK_USE_PLATFORM_XCB_KHR only #if(VULKAN AND NOT WIN32) diff '--color=auto' -rupN libretro-ppsspp.orig/ext/CMakeLists.txt libretro-ppsspp/ext/CMakeLists.txt --- libretro-ppsspp.orig/ext/CMakeLists.txt 2021-10-01 17:28:30.136664237 +0200 +++ libretro-ppsspp/ext/CMakeLists.txt 2021-10-01 17:30:45.282654341 +0200 @@ -22,4 +22,3 @@ add_subdirectory(SPIRV-Cross-build) if(USE_DISCORD AND NOT IOS AND NOT LIBRETRO) add_subdirectory(discord-rpc-build) endif() -add_subdirectory(zstd/build/cmake EXCLUDE_FROM_ALL)