From 94bcd64153b9b784cd989b04fa4adfca159e96af Mon Sep 17 00:00:00 2001 From: crueter Date: Sat, 23 Aug 2025 19:42:49 +0200 Subject: [cmake] refactor: SDL2 CI and CPMUtil::AddCIPackage (#284) Replaces bundled SDL2 with my SDL2 CI, and updates external SDL2 Additionally, reduces all that boilerplate with a common AddCIPackage in CPMUtil.cmake, currently used by OpenSSL and SDL2. To be used with ffmpeg in the future Signed-off-by: crueter Reviewed-on: https://git.eden-emu.dev/eden-emu/eden/pulls/284 Reviewed-by: Lizzie Reviewed-by: Shinmegumi --- src/core/CMakeLists.txt | 6 +----- src/core/internal_network/network.cpp | 4 ++-- src/core/internal_network/network.h | 2 +- src/core/internal_network/sockets.h | 4 ++-- 4 files changed, 6 insertions(+), 10 deletions(-) (limited to 'src/core') diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 5f9bfa2214..eab506f194 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1251,11 +1251,7 @@ if(ENABLE_OPENSSL) find_package(OpenSSL REQUIRED) - if (OpenSSL_ADDED) - link_openssl(core) - else() - target_link_libraries(core PRIVATE OpenSSL::SSL) - endif() + target_link_libraries(core PRIVATE OpenSSL::SSL OpenSSL::Crypto) elseif (APPLE) target_sources(core PRIVATE hle/service/ssl/ssl_backend_securetransport.cpp) diff --git a/src/core/internal_network/network.cpp b/src/core/internal_network/network.cpp index 49179617a7..6a3c6e9c41 100644 --- a/src/core/internal_network/network.cpp +++ b/src/core/internal_network/network.cpp @@ -12,7 +12,7 @@ #ifdef _WIN32 #include #include -#elif defined(__unix__) +#elif defined(__unix__) || defined(__APPLE__) #include #include #include @@ -162,7 +162,7 @@ Errno TranslateNativeError(int e, CallType call_type = CallType::Other) { } } -#elif defined(__unix__) // ^ _WIN32 v __unix__ +#elif defined(__unix__) || defined(__APPLE__) // ^ _WIN32 v __unix__ using SOCKET = int; using WSAPOLLFD = pollfd; diff --git a/src/core/internal_network/network.h b/src/core/internal_network/network.h index 64f3f121df..5a3343efd9 100644 --- a/src/core/internal_network/network.h +++ b/src/core/internal_network/network.h @@ -104,7 +104,7 @@ constexpr IPv4Address TranslateIPv4(in_addr addr) { auto& bytes = addr.S_un.S_un_b; return IPv4Address{bytes.s_b1, bytes.s_b2, bytes.s_b3, bytes.s_b4}; } -#elif defined(__unix__) +#elif defined(__unix__) || defined(__APPLE__) constexpr IPv4Address TranslateIPv4(in_addr addr) { const u32 bytes = addr.s_addr; return IPv4Address{static_cast(bytes), static_cast(bytes >> 8), diff --git a/src/core/internal_network/sockets.h b/src/core/internal_network/sockets.h index 65ebb893ad..27468709fd 100644 --- a/src/core/internal_network/sockets.h +++ b/src/core/internal_network/sockets.h @@ -10,7 +10,7 @@ #if defined(_WIN32) // windows -#elif defined(__unix__) +#elif defined(__unix__) || defined(__APPLE__) // unix #else // haiku @@ -28,7 +28,7 @@ struct ProxyPacket; class SocketBase { public: -#ifdef __unix__ +#if defined(__unix__) || defined(__APPLE__) using SOCKET = int; static constexpr SOCKET INVALID_SOCKET = -1; static constexpr SOCKET SOCKET_ERROR = -1; -- cgit v1.2.3