From 8b116aaa04031d5815fc52773453aa0b4654ba8a Mon Sep 17 00:00:00 2001 From: Steveice10 <1269164+Steveice10@users.noreply.github.com> Date: Sat, 25 Feb 2023 02:58:38 -0800 Subject: [PATCH] externals: Fix mismatched CryptoPP definitions between compile time and header use. (#6314) --- CMakeLists.txt | 5 +++++ externals/CMakeLists.txt | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index cd85c0b8b..6e575323b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -379,6 +379,11 @@ endif() enable_testing() add_subdirectory(externals) +# See externals/CMakeLists.txt +foreach(def ${CRYPTOPP_COMPILE_DEFINITIONS}) + add_definitions(-D${def}) +endforeach() + # Boost if (USE_SYSTEM_BOOST) find_package(Boost 1.70.0 COMPONENTS serialization REQUIRED) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 3c290347a..48bd2ac34 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -35,6 +35,12 @@ set(CRYPTOPP_INSTALL OFF) set(CRYPTOPP_SOURCES "${CMAKE_SOURCE_DIR}/externals/cryptopp") add_subdirectory(cryptopp-cmake) +# HACK: Mismatch between compilation of CryptoPP and headers used in Citra can cause runtime issues. +# Pull out the compile definitions from CryptoPP and apply them to Citra as well to fix this. +# See: https://github.com/weidai11/cryptopp/issues/1191 +get_source_file_property(CRYPTOPP_COMPILE_DEFINITIONS ${CRYPTOPP_SOURCES}/cryptlib.cpp TARGET_DIRECTORY cryptopp COMPILE_DEFINITIONS) +set(CRYPTOPP_COMPILE_DEFINITIONS ${CRYPTOPP_COMPILE_DEFINITIONS} PARENT_SCOPE) + # HACK: The logic to set up the base include directory for CryptoPP does not work with Android SDK CMake 3.22.1. # Until there is a fixed version available, this code will detect and add in the proper include if it does not exist. if(ANDROID)