mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-12-08 20:58:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

externals: Remove need for cryptopp build. (#2707)

Browse Source
This commit is contained in:
squidbus
2025-03-29 01:32:06 -07:00
committed by GitHub
parent 78c8bca2bb
commit be7d646e83
9 changed files with 1398 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
externals/CMakeLists.txt vendored
View File

@@ -26,21 +26,7 @@ if (NOT TARGET fmt::fmt)
add_subdirectory(fmt)
endif()
# CryptoPP
if (NOT TARGET cryptopp::cryptopp)
set(CRYPTOPP_INSTALL OFF)
set(CRYPTOPP_BUILD_TESTING OFF)
set(CRYPTOPP_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp)
# cryptopp instruction set checks do not account for added compile options,
# so disable extensions in the library config to match our chosen target CPU.
set(CRYPTOPP_DISABLE_AESNI ON)
set(CRYPTOPP_DISABLE_AVX2 ON)
add_subdirectory(cryptopp-cmake)
file(COPY cryptopp DESTINATION cryptopp FILES_MATCHING PATTERN "*.h")
# remove externals/cryptopp from include directories because it contains a conflicting zlib.h file
set_target_properties(cryptopp PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}/cryptopp")
endif()
# FFmpeg
if (NOT TARGET FFmpeg::ffmpeg)
add_subdirectory(ffmpeg-core)
add_library(FFmpeg::ffmpeg ALIAS ffmpeg)

1
externals/cryptopp vendored

Submodule externals/cryptopp deleted from effed0d0b8

1
externals/cryptopp-cmake vendored

Submodule externals/cryptopp-cmake deleted from 2c384c2826