Ecosystem/xmrig
Ecosystem/xmrig
1
0
Fork 0
mirror of https://github.com/xmrig/xmrig.git synced 2024-11-18 10:01:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

#1150 Fixed argon2 header conflict.

Browse source
This commit is contained in:
XMRig 2019-10-01 01:18:22 +07:00
parent f60118ee79
commit 158d2e4302
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/3rdparty/argon2/CMakeLists.txt vendored
View file

@ -38,7 +38,7 @@ if (CMAKE_C_COMPILER_ID MATCHES MSVC)
elseif (NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8) elseif (NOT XMRIG_ARM AND CMAKE_SIZEOF_VOID_P EQUAL 8)
function(add_feature_impl FEATURE GCC_FLAG DEF) function(add_feature_impl FEATURE GCC_FLAG DEF)
add_library(argon2-${FEATURE} STATIC arch/x86_64/lib/argon2-${FEATURE}.c) add_library(argon2-${FEATURE} STATIC arch/x86_64/lib/argon2-${FEATURE}.c)
target_include_directories(argon2-${FEATURE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) target_include_directories(argon2-${FEATURE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../)
target_include_directories(argon2-${FEATURE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib) target_include_directories(argon2-${FEATURE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib)
set_target_properties(argon2-${FEATURE} PROPERTIES POSITION_INDEPENDENT_CODE True) set_target_properties(argon2-${FEATURE} PROPERTIES POSITION_INDEPENDENT_CODE True)
@ -84,5 +84,5 @@ endif()
add_library(argon2 STATIC ${ARGON2_SOURCES}) add_library(argon2 STATIC ${ARGON2_SOURCES})
target_link_libraries(argon2 ${ARGON2_LIBS}) target_link_libraries(argon2 ${ARGON2_LIBS})
target_include_directories(argon2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include) target_include_directories(argon2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../../)
target_include_directories(argon2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib) target_include_directories(argon2 PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/lib)

2
src/3rdparty/argon2/lib/argon2.c vendored
View file

@ -15,7 +15,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
#include "argon2.h" #include "3rdparty/argon2.h"
#include "encoding.h" #include "encoding.h"
#include "core.h" #include "core.h"

2
src/3rdparty/argon2/lib/core.h vendored
View file

@ -14,7 +14,7 @@
#ifndef ARGON2_CORE_H #ifndef ARGON2_CORE_H
#define ARGON2_CORE_H #define ARGON2_CORE_H
#include "argon2.h" #include "3rdparty/argon2.h"
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define ALIGN(n) __declspec(align(16)) #define ALIGN(n) __declspec(align(16))

2
src/3rdparty/argon2/lib/encoding.h vendored
View file

@ -1,6 +1,6 @@
#ifndef ENCODING_H #ifndef ENCODING_H
#define ENCODING_H #define ENCODING_H
#include "argon2.h" #include "3rdparty/argon2.h"
#define ARGON2_MAX_DECODED_LANES UINT32_C(255) #define ARGON2_MAX_DECODED_LANES UINT32_C(255)
#define ARGON2_MIN_DECODED_SALT_LEN UINT32_C(8) #define ARGON2_MIN_DECODED_SALT_LEN UINT32_C(8)

2
src/3rdparty/argon2/lib/impl-select.c vendored
View file

@ -3,7 +3,7 @@
#include "impl-select.h" #include "impl-select.h"
#include "argon2.h" #include "3rdparty/argon2.h"
#define BENCH_SAMPLES 1024 #define BENCH_SAMPLES 1024
#define BENCH_MEM_BLOCKS 512 #define BENCH_MEM_BLOCKS 512