Merge branch 'master' into dev

CMakeLists.txt

@@ -14,6 +14,7 @@ option(WITH_DEBUG_LOG       "Enable debug log output" OFF)
 option(WITH_TLS             "Enable OpenSSL support" ON)
 option(WITH_ASM             "Enable ASM PoW implementations" ON)
 option(WITH_MSR             "Enable MSR mod & 1st-gen Ryzen fix" ON)
+option(WITH_ENV_VARS        "Enable environment variables support in config file" ON)
 option(WITH_EMBEDDED_CONFIG "Enable internal embedded JSON config" OFF)
 option(WITH_OPENCL          "Enable OpenCL backend" ON)
 option(WITH_CUDA            "Enable CUDA backend" ON)

doc/ALGORITHMS.md

@@ -25,7 +25,6 @@ Option `coin` useful for pools without algorithm negotiation support or daemon t
 | `cn/zls` | 2 MB | 2.14.0+ | CryptoNight variant 2 with 3/4 iterations. |
 | `cn/double` | 2 MB | 2.14.0+ | CryptoNight variant 2 with double iterations. |
 | `cn/r` | 2 MB | 2.13.0+ | CryptoNightR (Monero's variant 4). |
-| `cn/wow` | 2 MB | 2.12.0+ | CryptoNightR (Wownero). |
 | `cn/gpu` | 2 MB | 2.11.0+ | CryptoNight-GPU. |
 | `cn-pico` | 256 KB | 2.10.0+ | CryptoNight-Pico. |
 | `cn/half` | 2 MB | 2.9.0+ | CryptoNight variant 2 with half iterations. |

src/base/base.cmake

@@ -169,3 +169,15 @@ else()
     remove_definitions(/DXMRIG_FEATURE_HTTP)
     remove_definitions(/DXMRIG_FEATURE_API)
 endif()
+
+
+if (WITH_ENV_VARS AND CMAKE_CXX_COMPILER_ID MATCHES GNU AND CMAKE_CXX_COMPILER_VERSION VERSION_LESS 4.9)
+    set(WITH_ENV_VARS OFF)
+endif()
+
+
+if (WITH_ENV_VARS)
+    add_definitions(/DXMRIG_FEATURE_ENV)
+else()
+    remove_definitions(/DXMRIG_FEATURE_ENV)
+endif()

src/base/kernel/Env.cpp

@@ -50,6 +50,7 @@
 namespace xmrig {
 
 
+#ifdef XMRIG_FEATURE_ENV
 static std::map<String, String> variables;
 
 
@@ -59,6 +60,7 @@ static void createVariables()
     variables.insert({ "XMRIG_EXE_DIR", Process::location(Process::ExeLocation, "") });
     variables.insert({ "XMRIG_CWD",     Process::location(Process::CwdLocation, "") });
 }
+#endif
 
 
 } // namespace xmrig
@@ -66,6 +68,7 @@ static void createVariables()
 
 xmrig::String xmrig::Env::expand(const char *in)
 {
+#   ifdef XMRIG_FEATURE_ENV
     if (in == nullptr) {
         return {};
     }
@@ -103,11 +106,15 @@ xmrig::String xmrig::Env::expand(const char *in)
     }
 
     return text.c_str();
+#   else
+    return in;
+#   endif
 }
 
 
 xmrig::String xmrig::Env::get(const String &name)
 {
+#   ifdef XMRIG_FEATURE_ENV
     if (variables.empty()) {
         createVariables();
     }
@@ -115,6 +122,7 @@ xmrig::String xmrig::Env::get(const String &name)
     if (variables.count(name)) {
         return variables.at(name);
     }
+#   endif
 
     return static_cast<const char *>(getenv(name));
 }

src/version.h

@@ -28,7 +28,7 @@
 #define APP_ID        "xmrig"
 #define APP_NAME      "XMRig"
 #define APP_DESC      "XMRig miner"
-#define APP_VERSION   "5.5.0-dev"
+#define APP_VERSION   "5.5.0"
 #define APP_DOMAIN    "xmrig.com"
 #define APP_SITE      "www.xmrig.com"
 #define APP_COPYRIGHT "Copyright (C) 2016-2019 xmrig.com"