From e472858bc8f49e452f23771b82bbf73387d6bda2 Mon Sep 17 00:00:00 2001 From: Yuri Kunde Schlesner Date: Sat, 9 Dec 2017 21:32:37 -0800 Subject: [PATCH] cryptopp: Move some source files to beginning of list This is recommended by the Crypto++ readme: https://github.com/weidai11/cryptopp/blob/2d4614084a4250ce4d60d535ccf506605477e4ed/Readme.txt#L188-L193 --- externals/cryptopp/CMakeLists.txt | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/externals/cryptopp/CMakeLists.txt b/externals/cryptopp/CMakeLists.txt index 81c51f403..a724eb524 100644 --- a/externals/cryptopp/CMakeLists.txt +++ b/externals/cryptopp/CMakeLists.txt @@ -120,13 +120,19 @@ file(GLOB cryptopp_HEADERS cryptopp/*.h) # These have been trimmed to include only things Citra uses. This speeds up # compiles and reduces the amount of compilation breakage. set(cryptopp_SOURCES + # The Crypto++ readme says you should put these 3 object files first, + # to avoid "problems associated with C++ static initialization order", + # but doesn't actually tell what could go wrong. Better safe than sorry + # I guess... + cryptopp/cryptlib.cpp + cryptopp/cpu.cpp + cryptopp/integer.cpp + cryptopp/algparam.cpp cryptopp/asn.cpp cryptopp/authenc.cpp cryptopp/basecode.cpp cryptopp/ccm.cpp - cryptopp/cpu.cpp - cryptopp/cryptlib.cpp cryptopp/des.cpp cryptopp/dessp.cpp cryptopp/dll.cpp @@ -139,7 +145,6 @@ set(cryptopp_SOURCES cryptopp/hex.cpp cryptopp/hmac.cpp cryptopp/hrtimer.cpp - cryptopp/integer.cpp cryptopp/iterhash.cpp cryptopp/md5.cpp cryptopp/misc.cpp