fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Updated build

Browse source
This commit is contained in:
MoneroOcean 2025-06-16 19:59:42 -07:00
parent 60895ccec9
commit c13d0d7d79
6 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmake/OpenSSL.cmake
View file

@ -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)

2
cmake/asm.cmake
View file

@ -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"

6
cmake/flags.cmake
View file

@ -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)

6
cmake/randomx.cmake
View file

@ -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

2
src/backend/opencl/opencl.cmake
View file

@ -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)

4
src/base/base.cmake
View file

@ -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)