N-archive/citra
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

externals: Update cryptopp to 6.0.0

Browse source 
MSVC C++17 support
This commit is contained in:
MerryMage 2018-02-07 21:31:46 +00:00
parent ce31cf531d
commit 1f04e2e4a1
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
externals/cryptopp/CMakeLists.txt vendored
View file

@ -157,11 +157,18 @@ set(cryptopp_SOURCES
cryptopp/queue.cpp cryptopp/queue.cpp
cryptopp/randpool.cpp cryptopp/randpool.cpp
cryptopp/rdtables.cpp cryptopp/rdtables.cpp
cryptopp/rijndael-simd.cpp
cryptopp/rijndael.cpp cryptopp/rijndael.cpp
cryptopp/rng.cpp cryptopp/rng.cpp
cryptopp/sha-simd.cpp
cryptopp/sha.cpp cryptopp/sha.cpp
cryptopp/sse-simd.cpp
) )
if (MINGW OR WIN32)
list(APPEND cryptopp_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/winpipes.cpp)
endif ()
if(MSVC AND NOT CRYPTOPP_DISABLE_ASM) if(MSVC AND NOT CRYPTOPP_DISABLE_ASM)
if(${CMAKE_GENERATOR} MATCHES ".*ARM") if(${CMAKE_GENERATOR} MATCHES ".*ARM")
message(STATUS "Disabling ASM because ARM is specified as target platform.") message(STATUS "Disabling ASM because ARM is specified as target platform.")
@ -181,6 +188,16 @@ if(MSVC AND NOT CRYPTOPP_DISABLE_ASM)
endif() endif()
endif() endif()
if ((CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND NOT CRYPTOPP_DISABLE_ASM)
if(${CMAKE_GENERATOR} MATCHES ".*ARM")
message(STATUS "Disabling ASM because ARM is specified as target platform.")
else()
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/rijndael-simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.1 -maes")
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/sha-simd.cpp PROPERTIES COMPILE_FLAGS "-msse4.2 -msha")
set_source_files_properties(${CMAKE_CURRENT_SOURCE_DIR}/cryptopp/sse-simd.cpp PROPERTIES COMPILE_FLAGS "-msse2")
endif()
endif()
#============================================================================ #============================================================================
# Compile targets # Compile targets
#============================================================================ #============================================================================

2
externals/cryptopp/cryptopp vendored

@ -1 +1 @@
Subproject commit 24bc2b85674254fb294e717eb5b47d9f53e786b8 Subproject commit b6c6684451f925ab2e0b99acbaf66fd487ebfbd5