From 3290ed80d874d3e725a9257425f7a5b6872d151d Mon Sep 17 00:00:00 2001 From: ovosimpatico Date: Fri, 2 Jan 2026 09:00:48 -0300 Subject: [PATCH] fix macos build --- CMakeLists.txt | 4 ++-- src/core/internal_network/legacy_online.cpp | 9 ++++----- src/dynarmic/CMakeLists.txt | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c9b0071f64..acdcb85cea 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -425,7 +425,7 @@ if (YUZU_USE_CPM) endif() # fmt - AddJsonPackage(fmt) + AddJsonPackage(NAME fmt BUNDLED_PACKAGE ON) # lz4 AddJsonPackage(lz4) @@ -563,7 +563,7 @@ find_package(VulkanUtilityLibraries) find_package(SimpleIni) find_package(SPIRV-Tools) find_package(sirit) -find_package(gamemode) +find_package(gamemode) if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) find_package(xbyak) diff --git a/src/core/internal_network/legacy_online.cpp b/src/core/internal_network/legacy_online.cpp index 76670e46f1..b2900c96e4 100644 --- a/src/core/internal_network/legacy_online.cpp +++ b/src/core/internal_network/legacy_online.cpp @@ -130,10 +130,10 @@ void LegacyOnlineService::ServerLoop() { } LOG_INFO(Network, "Legacy Online Server waiting for messages..."); - + // Set a timeout for recvfrom so check is_running periodically if not closed via socket // Alternatively, closing the socket (as done in Stop) will cause recvfrom to return error - + char buffer[2048]; while (is_running) { sockaddr_in client_addr{}; @@ -143,11 +143,10 @@ void LegacyOnlineService::ServerLoop() { socklen_t client_len = sizeof(client_addr); #endif - int len = -1; #ifdef _WIN32 - len = recvfrom(static_cast(socket_fd), buffer, sizeof(buffer), 0, (sockaddr*)&client_addr, &client_len); + int len = recvfrom(static_cast(socket_fd), buffer, sizeof(buffer), 0, (sockaddr*)&client_addr, &client_len); #else - len = recvfrom(static_cast(socket_fd), buffer, sizeof(buffer), 0, (sockaddr*)&client_addr, &client_len); + ssize_t len = recvfrom(static_cast(socket_fd), buffer, sizeof(buffer), 0, (sockaddr*)&client_addr, &client_len); #endif if (!is_running) break; diff --git a/src/dynarmic/CMakeLists.txt b/src/dynarmic/CMakeLists.txt index 6d19c4355a..b0ad80de99 100644 --- a/src/dynarmic/CMakeLists.txt +++ b/src/dynarmic/CMakeLists.txt @@ -107,7 +107,7 @@ else() endif() find_package(Boost 1.57 REQUIRED) -find_package(fmt 8 CONFIG) +# find_package(fmt 8 CONFIG) # Pull in externals CMakeLists for libs where available add_subdirectory(externals)