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

#768 Fixed build error with MSVC 2015 and enabled ASM code.

Browse source
This commit is contained in:
XMRig 2018-10-02 17:50:19 +03:00
parent c2f6c70044
commit 152c4f2f1b
6 changed files with 811 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmake/asm.cmake
View file

@ -3,13 +3,19 @@ if (WITH_ASM AND NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
if (CMAKE_C_COMPILER_ID MATCHES MSVC)
enable_language(ASM_MASM)
set(XMRIG_ASM_FILE "src/crypto/asm/cnv2_main_loop.asm")
if (MSVC_TOOLSET_VERSION GREATER_EQUAL 141)
set(XMRIG_ASM_FILE "src/crypto/asm/cnv2_main_loop.asm")
else()
set(XMRIG_ASM_FILE "src/crypto/asm/win64/cnv2_main_loop.asm")
endif()
set_property(SOURCE ${XMRIG_ASM_FILE} PROPERTY ASM_MASM)
else()
enable_language(ASM)
if (WIN32 AND CMAKE_C_COMPILER_ID MATCHES GNU)
set(XMRIG_ASM_FILE "src/crypto/asm/cnv2_main_loop_win.S")
set(XMRIG_ASM_FILE "src/crypto/asm/win64/cnv2_main_loop.S")
else()
set(XMRIG_ASM_FILE "src/crypto/asm/cnv2_main_loop.S")
endif()