aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/CMakeLists.txt6
-rw-r--r--src/core/internal_network/network.cpp4
-rw-r--r--src/core/internal_network/network.h2
-rw-r--r--src/core/internal_network/sockets.h4
-rw-r--r--src/web_service/CMakeLists.txt8
-rw-r--r--src/yuzu/CMakeLists.txt6
6 files changed, 13 insertions, 17 deletions
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 <winsock2.h>
#include <ws2tcpip.h>
-#elif defined(__unix__)
+#elif defined(__unix__) || defined(__APPLE__)
#include <arpa/inet.h>
#include <errno.h>
#include <fcntl.h>
@@ -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<u8>(bytes), static_cast<u8>(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;
diff --git a/src/web_service/CMakeLists.txt b/src/web_service/CMakeLists.txt
index c1d5a84225..c1aaac9881 100644
--- a/src/web_service/CMakeLists.txt
+++ b/src/web_service/CMakeLists.txt
@@ -18,12 +18,8 @@ create_target_directory_groups(web_service)
target_include_directories(web_service PUBLIC ${cpp-jwt_SOURCE_DIR}/include)
target_link_libraries(web_service PRIVATE common network nlohmann_json::nlohmann_json httplib::httplib cpp-jwt::cpp-jwt)
-if (OpenSSL_ADDED)
- link_openssl(web_service)
-else()
- find_package(OpenSSL REQUIRED)
- target_link_libraries(web_service PRIVATE OpenSSL::SSL)
-endif()
+find_package(OpenSSL REQUIRED)
+target_link_libraries(web_service PRIVATE OpenSSL::SSL OpenSSL::Crypto)
if (YUZU_USE_PRECOMPILED_HEADERS)
target_precompile_headers(web_service PRIVATE precompiled_headers.h)
diff --git a/src/yuzu/CMakeLists.txt b/src/yuzu/CMakeLists.txt
index f7ec2985c7..f979a5c181 100644
--- a/src/yuzu/CMakeLists.txt
+++ b/src/yuzu/CMakeLists.txt
@@ -406,7 +406,11 @@ if (NOT WIN32)
target_include_directories(yuzu PRIVATE ${Qt6Gui_PRIVATE_INCLUDE_DIRS})
endif()
if (UNIX AND NOT APPLE)
- target_link_libraries(yuzu PRIVATE Qt6::DBus Qt6::GuiPrivate)
+ target_link_libraries(yuzu PRIVATE Qt6::DBus)
+
+ if (TARGET Qt6::GuiPrivate)
+ target_link_libraries(yuzu PRIVATE Qt6::GuiPrivate)
+ endif()
endif()
target_compile_definitions(yuzu PRIVATE