From b373f488054745342442b788c8bfc8074e7d1a13 Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Mon, 16 Jun 2025 20:22:41 -0700 Subject: [PATCH] Updated build --- .github/workflows/test.yml | 2 +- CMakeLists.txt | 1 + cmake/os.cmake | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c50de59e..47cacaf7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -26,7 +26,7 @@ jobs: run: git clone https://github.com/xmrig/xmrig-deps.git - name: Build project on Windows run: | - cmake . -G "MinGW Makefiles" -DXMRIG_DEPS=./xmrig-deps/gcc/x64 + cmake . -G "Unix Makefiles" -DXMRIG_DEPS=./xmrig-deps/gcc/x64 make -j2 build_lin: diff --git a/CMakeLists.txt b/CMakeLists.txt index 33584256..4e0d3fe1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -174,6 +174,7 @@ if (XMRIG_OS_WIN) ) set(EXTRA_LIBS ws2_32 psapi iphlpapi userenv dbghelp) + add_library(${EXTRA_LIBS} PRIVATE ole32 oleaut32) elseif (XMRIG_OS_APPLE) list(APPEND SOURCES_OS src/App_unix.cpp diff --git a/cmake/os.cmake b/cmake/os.cmake index 8f70e9f4..5efeceef 100644 --- a/cmake/os.cmake +++ b/cmake/os.cmake @@ -1,4 +1,4 @@ -if (WIN32) +if (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "MSYS") set(XMRIG_OS_WIN ON) elseif (APPLE) set(XMRIG_OS_APPLE ON)