piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-28 01:49:33 -06:00
Code Issues Packages Projects Releases Wiki Activity

Externals/zstd: Disable ASM for MSVC compiler in CMake

Browse Source 
Results in a "MSVC_RUNTIME_LIBRARY value 'MultiThreadedDLL' not known for this ASM compiler" otherwise, and zstd doesn't support the relevant ASM code for MSVC anyway.
This commit is contained in:
Admiral H. Curtiss
2025-04-30 20:31:49 +02:00
parent 852bd6df1a
commit 2d9a61bd0e
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Externals/zstd/CMakeLists.txt vendored
View File

@ -1,4 +1,8 @@
project(zstd C ASM) project(zstd C)
if(NOT MSVC)
enable_language(ASM)
endif()
include(CheckTypeSize) include(CheckTypeSize)
include(CheckFunctionExists) include(CheckFunctionExists)
@ -120,7 +124,6 @@ set(ZSTD_SRCS
zstd/lib/compress/zstd_preSplit.c zstd/lib/compress/zstd_preSplit.c
zstd/lib/compress/zstdmt_compress.c zstd/lib/compress/zstdmt_compress.c
zstd/lib/decompress/huf_decompress.c zstd/lib/decompress/huf_decompress.c
zstd/lib/decompress/huf_decompress_amd64.S
zstd/lib/decompress/zstd_ddict.c zstd/lib/decompress/zstd_ddict.c
zstd/lib/decompress/zstd_decompress.c zstd/lib/decompress/zstd_decompress.c
zstd/lib/decompress/zstd_decompress_block.c zstd/lib/decompress/zstd_decompress_block.c
@ -129,6 +132,12 @@ set(ZSTD_SRCS
add_library(zstd STATIC ${ZSTD_SRCS} ${ZSTD_PUBLIC_HDRS} ${ZSTD_PRIVATE_HDRS}) add_library(zstd STATIC ${ZSTD_SRCS} ${ZSTD_PUBLIC_HDRS} ${ZSTD_PRIVATE_HDRS})
target_compile_definitions(zstd PUBLIC ZSTD_LEGACY_SUPPORT=0) target_compile_definitions(zstd PUBLIC ZSTD_LEGACY_SUPPORT=0)
if(MSVC)
target_compile_definitions(zstd PUBLIC ZSTD_DISABLE_ASM)
else()
target_sources(zstd PRIVATE zstd/lib/decompress/huf_decompress_amd64.S)
endif()
dolphin_disable_warnings(zstd) dolphin_disable_warnings(zstd)
add_library(zstd::zstd ALIAS zstd) add_library(zstd::zstd ALIAS zstd)