Build: Use shared webp/zstd/zlib

This commit is contained in:
Stenzek
2024-02-03 17:12:40 +10:00
parent d793dbf8b9
commit c2c3eac749
18 changed files with 320 additions and 88 deletions

View File

@ -3,10 +3,6 @@ add_subdirectory(fmt EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(fmt)
add_subdirectory(stb EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(stb)
add_subdirectory(zlib EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(zlib)
add_subdirectory(zstd EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(zstd)
add_subdirectory(minizip EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(minizip)
add_subdirectory(lzma EXCLUDE_FROM_ALL)
@ -34,6 +30,14 @@ disable_compiler_warnings_for_target(reshadefx)
add_subdirectory(rcheevos EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(rcheevos)
# Build dependencies on Windows/Android.
if(WIN32 OR ANDROID)
add_subdirectory(zlib EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(zlib)
add_subdirectory(zstd EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(zstd)
endif()
if(ENABLE_CUBEB)
add_subdirectory(cubeb EXCLUDE_FROM_ALL)
disable_compiler_warnings_for_target(cubeb)

View File

@ -15,5 +15,5 @@ add_library(libchdr
)
target_include_directories(libchdr PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_link_libraries(libchdr PRIVATE zlib lzma)
target_link_libraries(libchdr PRIVATE ZLIB::ZLIB lzma)

View File

@ -18,5 +18,5 @@ endif()
target_include_directories(minizip PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_include_directories(minizip INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_link_libraries(minizip zlib)
target_link_libraries(minizip ZLIB::ZLIB)

View File

@ -10,4 +10,4 @@ set(SRCS
add_library(stb ${SRCS})
target_include_directories(stb PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include" "${CMAKE_CURRENT_SOURCE_DIR}/src")
target_include_directories(stb INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_link_libraries(stb zlib Threads::Threads "${CMAKE_DL_LIBS}")
target_link_libraries(stb ZLIB::ZLIB Threads::Threads "${CMAKE_DL_LIBS}")

View File

@ -29,3 +29,4 @@ add_library(zlib
target_include_directories(zlib PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include")
target_include_directories(zlib INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
add_library(ZLIB::ZLIB ALIAS zlib)