jakoddannudau/rig
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build fixes.

Browse Source
This commit is contained in:
XMRig
2021-08-30 23:41:53 +07:00
parent cac1e4aa5e
commit e3b5bfeb36
11 changed files with 18 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/randomx.cmake
View File

@ -124,5 +124,5 @@ if (WITH_RANDOMX)
endif()
message(STATUS "WITH_MSR\t= ${WITH_MSR}")
message(STATUS "WITH_PROFILING\t= ${WITH_PROFILING}")
message(STATUS "WITH_MSR \t= ${WITH_MSR}")
message(STATUS "WITH_PROFILING \t= ${WITH_PROFILING}")

20
src/backend/cpu/cpu.cmake
View File

@ -22,28 +22,8 @@ set(SOURCES_BACKEND_CPU
)
if (WITH_HWLOC)
if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)
add_subdirectory(src/3rdparty/hwloc)
include_directories(src/3rdparty/hwloc/include)
set(CPUID_LIB hwloc)
else()
find_package(HWLOC REQUIRED)
include_directories(${HWLOC_INCLUDE_DIR})
set(CPUID_LIB ${HWLOC_LIBRARY})
endif()
add_definitions(/DXMRIG_FEATURE_HWLOC)
if (HWLOC_DEBUG)
add_definitions(/DXMRIG_HWLOC_DEBUG)
endif()
list(APPEND HEADERS_BACKEND_CPU src/backend/cpu/platform/HwlocCpuInfo.h)
list(APPEND SOURCES_BACKEND_CPU src/backend/cpu/platform/HwlocCpuInfo.cpp)
else()
remove_definitions(/DXMRIG_FEATURE_HWLOC)
set(CPUID_LIB "")
endif()
if (XMRIG_ARM)

2
src/base/cmake/cpu.cmake
View File

@ -9,7 +9,7 @@ if (NOT CMAKE_SYSTEM_PROCESSOR)
message(WARNING "CMAKE_SYSTEM_PROCESSOR not defined")
endif()
message(STATUS "XMRIG_64_BIT\t= ${XMRIG_64_BIT} (${CMAKE_SYSTEM_PROCESSOR})")
message(STATUS "XMRIG_64_BIT \t= ${XMRIG_64_BIT} (${CMAKE_SYSTEM_PROCESSOR})")
if (XMRIG_64_BIT AND CMAKE_SYSTEM_PROCESSOR MATCHES "^(x86_64|AMD64)$")
add_definitions(-DRAPIDJSON_SSE2)

16
src/base/cmake/option/algorithms.cmake
View File

@ -2,14 +2,14 @@ if (WITH_RANDOMX AND NOT WITH_ARGON2)
set(WITH_ARGON2 ON)
endif()
message(STATUS "WITH_CN_LITE\t= ${WITH_CN_LITE}")
message(STATUS "WITH_CN_HEAVY\t= ${WITH_CN_HEAVY}")
message(STATUS "WITH_CN_PICO\t= ${WITH_CN_PICO}")
message(STATUS "WITH_CN_FEMTO\t= ${WITH_CN_FEMTO}")
message(STATUS "WITH_RANDOMX\t= ${WITH_RANDOMX}")
message(STATUS "WITH_ARGON2\t= ${WITH_ARGON2}")
message(STATUS "WITH_ASTROBWT\t= ${WITH_ASTROBWT}")
message(STATUS "WITH_KAWPOW\t= ${WITH_KAWPOW}")
message(STATUS "WITH_CN_LITE \t= ${WITH_CN_LITE}")
message(STATUS "WITH_CN_HEAVY \t= ${WITH_CN_HEAVY}")
message(STATUS "WITH_CN_PICO \t= ${WITH_CN_PICO}")
message(STATUS "WITH_CN_FEMTO \t= ${WITH_CN_FEMTO}")
message(STATUS "WITH_RANDOMX \t= ${WITH_RANDOMX}")
message(STATUS "WITH_ARGON2 \t= ${WITH_ARGON2}")
message(STATUS "WITH_ASTROBWT \t= ${WITH_ASTROBWT}")
message(STATUS "WITH_KAWPOW \t= ${WITH_KAWPOW}")
if (WITH_CN_LITE)
add_definitions(-DXMRIG_ALGO_CN_LITE)

2
src/base/cmake/option/http.cmake
View File

@ -1,4 +1,4 @@
message(STATUS "WITH_HTTP\t= ${WITH_HTTP}")
message(STATUS "WITH_HTTP \t= ${WITH_HTTP}")
if (WITH_HTTP)
add_definitions(-DXMRIG_FEATURE_HTTP -DXMRIG_FEATURE_API)

3
src/base/cmake/option/hwloc.cmake
View File

@ -1,5 +1,4 @@
message(STATUS "WITH_HWLOC\t= ${WITH_HWLOC} (DEBUG=${HWLOC_DEBUG})")
message(STATUS "WITH_HWLOC \t= ${WITH_HWLOC} (DEBUG=${HWLOC_DEBUG})")
if (WITH_HWLOC)
if (CMAKE_CXX_COMPILER_ID MATCHES MSVC)

2
src/base/cmake/option/sodium.cmake
View File

@ -1,4 +1,4 @@
message(STATUS "WITH_SODIUM\t= ${WITH_SODIUM}")
message(STATUS "WITH_SODIUM \t= ${WITH_SODIUM}")
if (WITH_SODIUM)
find_package(Sodium REQUIRED)

4
src/base/cmake/option/tls.cmake
View File

@ -20,7 +20,7 @@ if (WITH_TLS)
add_definitions(-DXMRIG_FEATURE_TLS)
message(STATUS "WITH_TLS\t= ON (v${OPENSSL_VERSION})")
message(STATUS "WITH_TLS \t= ON (v${OPENSSL_VERSION})")
else()
message(STATUS "WITH_TLS\t= ${WITH_TLS}")
message(STATUS "WITH_TLS \t= ${WITH_TLS}")
endif()

1
src/hw/api/HwApi.cpp
View File

@ -16,7 +16,6 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#include "hw/api/HwApi.h"
#include "base/api/interfaces/IApiRequest.h"
#include "base/tools/String.h"

2
src/hw/api/HwApi.h
View File

@ -29,7 +29,7 @@
namespace xmrig {
struct DmiReader;
class DmiReader;
class HwApi : public IApiListener

2
src/hw/dmi/dmi.cmake
View File

@ -30,4 +30,4 @@ if (WITH_DMI)
endif()
endif()
message(STATUS "WITH_DMI\t= ${WITH_DMI}")
message(STATUS "WITH_DMI \t= ${WITH_DMI}")