Sync changes.

src/common/config/CommonConfig.cpp

@@ -39,6 +39,20 @@
 #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/log/Log.h"
 #include "donate.h"
@@ -154,6 +168,9 @@ void xmrig::CommonConfig::printVersions()
     const char *ocl = "0.0";
 #   endif
     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
     memset(buf, 0, 16);
     int length = 0;
@@ -170,7 +187,6 @@ void xmrig::CommonConfig::printVersions()
     length += snprintf(buf + length, (sizeof buf) - length, "microhttpd/%s ", MHD_get_version());
 #   endif
 
-
     Log::i()->text(isColors() ? GREEN_BOLD(" * ") WHITE_BOLD("%-13slibuv/%s %s")
                               : " * %-13slibuv/%s %s",
                    "LIBS", uv_version_string(), buf);

src/common/interfaces/IConfig.h

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