mirrors/xmrig
1
0
Fork 1
mirror of https://github.com/xmrig/xmrig.git synced 2026-06-24 04:24:35 -04:00
Code Issues Projects Releases Wiki Activity

Merge xmrig v6.12.2 into master

Browse Source
This commit is contained in:
MoneroOcean
2021-05-31 15:06:47 +00:00
parent 4c6d815b19 80ae339343
commit 28ad107de8
28 changed files with 987 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/config/Config.cpp
View File

@@ -231,11 +231,15 @@ bool xmrig::Config::read(const IJsonReader &reader, const char *fileName)
# endif
# ifdef XMRIG_FEATURE_OPENCL
d_ptr->cl.read(reader.getValue(kOcl));
if (!pools().isBenchmark()) {
d_ptr->cl.read(reader.getValue(kOcl));
}
# endif
# ifdef XMRIG_FEATURE_CUDA
d_ptr->cuda.read(reader.getValue(kCuda));
if (!pools().isBenchmark()) {
d_ptr->cuda.read(reader.getValue(kCuda));
}
# endif
# if defined(XMRIG_FEATURE_NVML) || defined (XMRIG_FEATURE_ADL)