From c13d0d7d79cea9d72bf6690535645ed710837da9 Mon Sep 17 00:00:00 2001 From: MoneroOcean Date: Mon, 16 Jun 2025 19:59:42 -0700 Subject: [PATCH] Updated build --- cmake/OpenSSL.cmake | 2 +- cmake/asm.cmake | 2 +- cmake/flags.cmake | 6 +++--- cmake/randomx.cmake | 6 +++--- src/backend/opencl/opencl.cmake | 2 +- src/base/base.cmake | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cmake/OpenSSL.cmake b/cmake/OpenSSL.cmake index 84f97d54..84373f32 100644 --- a/cmake/OpenSSL.cmake +++ b/cmake/OpenSSL.cmake @@ -1,7 +1,7 @@ if (WITH_TLS) set(OPENSSL_ROOT_DIR ${XMRIG_DEPS}) - if (WIN32) + if (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "MSYS") set(OPENSSL_USE_STATIC_LIBS TRUE) set(OPENSSL_MSVC_STATIC_RT TRUE) diff --git a/cmake/asm.cmake b/cmake/asm.cmake index e445defd..233ce608 100644 --- a/cmake/asm.cmake +++ b/cmake/asm.cmake @@ -20,7 +20,7 @@ if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8) else() enable_language(ASM) - if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES GNU) + if ((WIN32 OR CMAKE_SYSTEM_NAME MATCHES "MSYS") AND CMAKE_C_COMPILER_ID MATCHES GNU) set(XMRIG_ASM_FILES "src/crypto/cn/asm/win64/cn_main_loop.S" "src/crypto/cn/asm/CryptonightR_template.S" diff --git a/cmake/flags.cmake b/cmake/flags.cmake index cdce9336..dd864ede 100644 --- a/cmake/flags.cmake +++ b/cmake/flags.cmake @@ -35,7 +35,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU) add_definitions(-DHAVE_ROTR) endif() - if (WIN32) + if (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "MSYS") if (CMAKE_SIZEOF_VOID_P EQUAL 8) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") else() @@ -84,12 +84,12 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES Clang) endif() endif() - if ((WIN32 AND ARM_TARGET) OR BUILD_STATIC) + if (((WIN32 OR CMAKE_SYSTEM_NAME MATCHES "MSYS") AND ARM_TARGET) OR BUILD_STATIC) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") endif() endif() -if (NOT WIN32) +if (NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES "MSYS") check_symbol_exists("__builtin___clear_cache" "stdlib.h" HAVE_BUILTIN_CLEAR_CACHE) if (HAVE_BUILTIN_CLEAR_CACHE) add_definitions(-DHAVE_BUILTIN_CLEAR_CACHE) diff --git a/cmake/randomx.cmake b/cmake/randomx.cmake index 6b044b08..c4d4b2e4 100644 --- a/cmake/randomx.cmake +++ b/cmake/randomx.cmake @@ -1,7 +1,7 @@ if (WITH_RANDOMX) include(CheckSymbolExists) - if (WIN32) + if (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "MSYS") check_symbol_exists(_aligned_malloc "stdlib.h" HAVE_ALIGNED_MALLOC) if (HAVE_ALIGNED_MALLOC) add_compile_definitions(HAVE_ALIGNED_MALLOC) @@ -54,8 +54,8 @@ if (WITH_RANDOMX) src/crypto/rx/RxDataset.cpp src/crypto/rx/RxQueue.cpp src/crypto/rx/RxVm.cpp - - ### Removed useless includes + + ### Removed useless includes src/crypto/randomx/panthera/sha256.c src/crypto/randomx/panthera/KangarooTwelve.c src/crypto/randomx/panthera/KeccakP-1600-reference.c diff --git a/src/backend/opencl/opencl.cmake b/src/backend/opencl/opencl.cmake index 803a6be0..1762506c 100644 --- a/src/backend/opencl/opencl.cmake +++ b/src/backend/opencl/opencl.cmake @@ -72,7 +72,7 @@ if (WITH_OPENCL) add_definitions(/DCL_TARGET_OPENCL_VERSION=${WITH_OPENCL_VERSION}) endif() - if (WIN32) + if (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "MSYS") list(APPEND SOURCES_BACKEND_OPENCL src/backend/opencl/OclCache_win.cpp) else() list(APPEND SOURCES_BACKEND_OPENCL src/backend/opencl/OclCache_unix.cpp) diff --git a/src/base/base.cmake b/src/base/base.cmake index 0f4f8725..0e195cf1 100644 --- a/src/base/base.cmake +++ b/src/base/base.cmake @@ -145,7 +145,7 @@ set(SOURCES_BASE ) -if (WIN32) +if (WIN32 OR CMAKE_SYSTEM_NAME MATCHES "MSYS") set(SOURCES_OS src/base/io/json/Json_win.cpp src/base/kernel/Platform_win.cpp @@ -173,7 +173,7 @@ if (WITH_HWLOC) endif() -if (NOT WIN32) +if (NOT WIN32 AND NOT CMAKE_SYSTEM_NAME MATCHES "MSYS") CHECK_INCLUDE_FILE (syslog.h HAVE_SYSLOG_H) if (HAVE_SYSLOG_H) add_definitions(/DHAVE_SYSLOG_H)