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

Merge

Browse source
This commit is contained in:
MoneroOcean 2019-08-18 15:08:51 -07:00
parent 2bd032b538
commit 7c8b4f72c8
2 changed files with 30 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

93
CMakeLists.txt
View file

@ -153,99 +153,6 @@ add_definitions(/DUNICODE)
find_package(UV REQUIRED)
<<<<<<< HEAD
if (WITH_RANDOMX)
include_directories(src/crypto/randomx)
include_directories(src/crypto/defyx)
add_definitions(/DXMRIG_ALGO_RANDOMX)
set(SOURCES_CRYPTO
"${SOURCES_CRYPTO}"
src/crypto/randomx/aes_hash.cpp
src/crypto/randomx/allocator.cpp
src/crypto/randomx/argon2_core.c
src/crypto/randomx/argon2_ref.c
src/crypto/randomx/blake2_generator.cpp
src/crypto/randomx/blake2/blake2b.c
src/crypto/randomx/bytecode_machine.cpp
src/crypto/randomx/dataset.cpp
src/crypto/randomx/instructions_portable.cpp
src/crypto/randomx/randomx.cpp
src/crypto/randomx/reciprocal.c
src/crypto/randomx/soft_aes.cpp
src/crypto/randomx/superscalar.cpp
src/crypto/randomx/virtual_machine.cpp
src/crypto/randomx/virtual_memory.cpp
src/crypto/randomx/vm_compiled_light.cpp
src/crypto/randomx/vm_compiled.cpp
src/crypto/randomx/vm_interpreted_light.cpp
src/crypto/randomx/vm_interpreted.cpp
src/crypto/rx/Rx.cpp
src/crypto/rx/Rx.h
src/crypto/rx/RxAlgo.cpp
src/crypto/rx/RxAlgo.h
src/crypto/rx/RxCache.cpp
src/crypto/rx/RxCache.h
src/crypto/rx/RxConfig.cpp
src/crypto/rx/RxConfig.h
src/crypto/rx/RxDataset.cpp
src/crypto/rx/RxDataset.h
src/crypto/rx/RxVm.cpp
src/crypto/rx/RxVm.h
src/crypto/defyx/align.h
src/crypto/defyx/brg_endian.h
src/crypto/defyx/defyx.cpp
src/crypto/defyx/defyx.h
src/crypto/defyx/KangarooTwelve.c
src/crypto/defyx/KangarooTwelve.h
src/crypto/defyx/KeccakP-1600-reference.c
src/crypto/defyx/KeccakP-1600-SnP.h
src/crypto/defyx/KeccakSponge-common.h
src/crypto/defyx/KeccakSponge.inc
src/crypto/defyx/KeccakSpongeWidth1600.c
src/crypto/defyx/KeccakSpongeWidth1600.h
src/crypto/defyx/Phases.h
src/crypto/defyx/sha256.c
src/crypto/defyx/sha256.h
src/crypto/defyx/sysendian.h
src/crypto/defyx/yescrypt.h
)
if (WIN32)
set(SOURCES_CRYPTO
"${SOURCES_CRYPTO}"
src/crypto/defyx/yescrypt-ref.c
)
else()
set(SOURCES_CRYPTO
"${SOURCES_CRYPTO}"
src/crypto/defyx/yescrypt-best.c
)
endif()
if (NOT ARCH_ID)
set(ARCH_ID ${CMAKE_HOST_SYSTEM_PROCESSOR})
endif()
if (CMAKE_C_COMPILER_ID MATCHES MSVC)
enable_language(ASM_MASM)
list(APPEND SOURCES_CRYPTO
src/crypto/randomx/jit_compiler_x86_static.asm
src/crypto/randomx/jit_compiler_x86.cpp
)
elseif (NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
list(APPEND SOURCES_CRYPTO
src/crypto/randomx/jit_compiler_x86_static.S
src/crypto/randomx/jit_compiler_x86.cpp
)
# cheat because cmake and ccache hate each other
set_property(SOURCE src/crypto/randomx/jit_compiler_x86_static.S PROPERTY LANGUAGE C)
endif()
else()
remove_definitions(/DXMRIG_ALGO_RANDOMX)
endif()
=======
>>>>>>> ce35260b5d806f3ff3c5e8126bb84d2e56a8c576
include(cmake/flags.cmake)
include(cmake/randomx.cmake)
include(cmake/argon2.cmake)

30
cmake/randomx.cmake
View file

@ -36,8 +36,38 @@ if (WITH_RANDOMX)
src/crypto/rx/RxConfig.cpp
src/crypto/rx/RxDataset.cpp
src/crypto/rx/RxVm.cpp
src/crypto/defyx/align.h
src/crypto/defyx/brg_endian.h
src/crypto/defyx/defyx.cpp
src/crypto/defyx/defyx.h
src/crypto/defyx/KangarooTwelve.c
src/crypto/defyx/KangarooTwelve.h
src/crypto/defyx/KeccakP-1600-reference.c
src/crypto/defyx/KeccakP-1600-SnP.h
src/crypto/defyx/KeccakSponge-common.h
src/crypto/defyx/KeccakSponge.inc
src/crypto/defyx/KeccakSpongeWidth1600.c
src/crypto/defyx/KeccakSpongeWidth1600.h
src/crypto/defyx/Phases.h
src/crypto/defyx/sha256.c
src/crypto/defyx/sha256.h
src/crypto/defyx/sysendian.h
src/crypto/defyx/yescrypt.h
)
if (WIN32)
set(SOURCES_CRYPTO
"${SOURCES_CRYPTO}"
src/crypto/defyx/yescrypt-ref.c
)
else()
set(SOURCES_CRYPTO
"${SOURCES_CRYPTO}"
src/crypto/defyx/yescrypt-best.c
)
endif()
if (CMAKE_C_COMPILER_ID MATCHES MSVC)
enable_language(ASM_MASM)
list(APPEND SOURCES_CRYPTO