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

Sync changes.

Browse source
This commit is contained in:
XMRig 2018-09-18 04:04:25 +03:00
parent 4c4e0593a7
commit bcd27ca259
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/common/config/CommonConfig.cpp
View file

@ -39,6 +39,20 @@
#endif #endif
#ifdef XMRIG_AMD_PROJECT
# if defined(__APPLE__)
# include <OpenCL/cl.h>
# else
# include "3rdparty/CL/cl.h"
# endif
#endif
#ifdef XMRIG_NVIDIA_PROJECT
# include "nvidia/cryptonight.h"
#endif
#include "common/config/CommonConfig.h" #include "common/config/CommonConfig.h"
#include "common/log/Log.h" #include "common/log/Log.h"
#include "donate.h" #include "donate.h"
@ -154,6 +168,9 @@ void xmrig::CommonConfig::printVersions()
const char *ocl = "0.0"; const char *ocl = "0.0";
# endif # endif
int length = snprintf(buf, sizeof buf, "OpenCL/%s ", ocl); int length = snprintf(buf, sizeof buf, "OpenCL/%s ", ocl);
# elif defined(XMRIG_NVIDIA_PROJECT)
const int cudaVersion = cuda_get_runtime_version();
int length = snprintf(buf, sizeof buf, "CUDA/%d.%d ", cudaVersion / 1000, cudaVersion % 100);
# else # else
memset(buf, 0, 16); memset(buf, 0, 16);
int length = 0; int length = 0;
@ -170,7 +187,6 @@ void xmrig::CommonConfig::printVersions()
length += snprintf(buf + length, (sizeof buf) - length, "microhttpd/%s ", MHD_get_version()); length += snprintf(buf + length, (sizeof buf) - length, "microhttpd/%s ", MHD_get_version());
# endif # endif
Log::i()->text(isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13slibuv/%s %s") Log::i()->text(isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13slibuv/%s %s")
: " * %-13slibuv/%s %s", : " * %-13slibuv/%s %s",
"LIBS", uv_version_string(), buf); "LIBS", uv_version_string(), buf);

18
src/common/interfaces/IConfig.h
View file

@ -82,13 +82,17 @@ public:
HardwareAESKey = 1011, HardwareAESKey = 1011,
// xmrig amd // xmrig amd
OclPlatform = 1400, OclPlatformKey = 1400,
OclAffinity = 1401, OclAffinityKey = 1401,
OclDevices = 1402, OclDevicesKey = 1402,
OclLaunch = 1403, OclLaunchKey = 1403,
OclCache = 1404, OclCacheKey = 1404,
OclPrint = 1405, OclPrintKey = 1405,
OclLoader = 1406, OclLoaderKey = 1406,
OclSridedIndexKey = 1407,
OclMemChunkKey = 1408,
OclUnrollKey = 1409,
OclCompModeKey = 1410,
// xmrig-proxy // xmrig-proxy
AccessLogFileKey = 'A', AccessLogFileKey = 'A',