Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2024-11-26 23:10:38 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Make a simpler CMakeLists.txt for zstd

Browse Source
This commit is contained in:
Henrik Rydgård 2024-05-04 10:48:54 +02:00
parent c8cf56ff21
commit e631be3607
3 changed files with 53 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -2361,9 +2361,7 @@ if(USE_SYSTEM_ZSTD)
target_include_directories(${CoreLibName} PRIVATE ${ZSTD_INCLUDE_DIR})
target_link_libraries(${CoreLibName} ${ZSTD_LIBRARY})
else()
set(ZSTD_BUILD_PROGRAMS OFF CACHE BOOL "we don't need zstd programs" FORCE)
set(ZSTD_LEGACY_SUPPORT OFF CACHE BOOL "we don't use any old zstd files" FORCE)
add_subdirectory(ext/zstd/build/cmake EXCLUDE_FROM_ALL)
add_subdirectory(ext/zstd-build)
set(CoreExtraLibs ${CoreExtraLibs} libzstd_static)
include_directories(ext/zstd/lib)
endif()

2
Core/HLE/sceKernelInterrupt.cpp
View File

@ -882,7 +882,7 @@ static int sysclib_sprintf(u32 dst, u32 fmt) {
}
}
DEBUG_LOG(SCEKERNEL, "sysclib_sprintf result string has length %u, content:", result.length());
DEBUG_LOG(SCEKERNEL, "sysclib_sprintf result string has length %d, content:", (int)result.length());
DEBUG_LOG(SCEKERNEL, "%s", result.c_str());
if (!Memory::IsValidRange(dst, result.length() + 1)) {
ERROR_LOG(SCEKERNEL, "sysclib_sprintf result string is too long or dst is invalid");

51
ext/zstd-build/CMakeLists.txt Normal file
View File

@ -0,0 +1,51 @@
cmake_minimum_required (VERSION 3.2.0)
project (libzstd_static)
set(SRC_DIR ../zstd/lib)
message(${SRC_DIR})
set(ALL_SOURCE_FILES
${SRC_DIR}/common/debug.c
${SRC_DIR}/common/entropy_common.c
${SRC_DIR}/common/error_private.c
${SRC_DIR}/common/fse_decompress.c
${SRC_DIR}/common/pool.c
${SRC_DIR}/common/threading.c
${SRC_DIR}/common/xxhash.c
${SRC_DIR}/common/zstd_common.c
${SRC_DIR}/compress/fse_compress.c
${SRC_DIR}/compress/hist.c
${SRC_DIR}/compress/huf_compress.c
${SRC_DIR}/compress/zstd_compress.c
${SRC_DIR}/compress/zstd_compress_literals.c
${SRC_DIR}/compress/zstd_compress_sequences.c
${SRC_DIR}/compress/zstd_compress_superblock.c
${SRC_DIR}/compress/zstd_double_fast.c
${SRC_DIR}/compress/zstd_fast.c
${SRC_DIR}/compress/zstd_lazy.c
${SRC_DIR}/compress/zstd_ldm.c
${SRC_DIR}/compress/zstd_opt.c
${SRC_DIR}/compress/zstdmt_compress.c
${SRC_DIR}/decompress/huf_decompress.c
${SRC_DIR}/decompress/zstd_ddict.c
${SRC_DIR}/decompress/zstd_decompress.c
${SRC_DIR}/decompress/zstd_decompress_block.c
${SRC_DIR}/dictBuilder/cover.c
${SRC_DIR}/dictBuilder/divsufsort.c
${SRC_DIR}/dictBuilder/fastcover.c
${SRC_DIR}/dictBuilder/zdict.c
)
if (MSVC)
add_compile_options(-DZSTD_DISABLE_ASM)
else ()
if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|AMD64.*|x86_64.*|X86_64.*")
set(ALL_SOURCE_FILES ${ALL_SOURCE_FILES} ${SRC_DIR}/decompress/huf_decompress_amd64.S)
else()
add_compile_options(-DZSTD_DISABLE_ASM)
endif()
endif ()
add_library(libzstd_static STATIC ${ALL_SOURCE_FILES})
target_include_directories(libzstd_static PUBLIC ../zstd/lib)