1
0
mirror of https://github.com/xmrig/xmrig.git synced 2025-12-26 06:00:00 -05:00

Merge branch 'evo' into feature-per-pool-algo

This commit is contained in:
XMRig
2019-07-06 10:49:31 +07:00
79 changed files with 9889 additions and 40 deletions

View File

@@ -107,8 +107,12 @@ static AlgoName const algorithm_names[] = {
{ "cryptonight_turtle", "cn_turtle", Algorithm::CN_PICO_0 },
# endif
# ifdef XMRIG_ALGO_RANDOMX
{ "randomx/0", "rx/0", Algorithm::RX_0 },
{ "RandomX", "rx", Algorithm::RX_0 },
{ "randomx/wow", "rx/wow", Algorithm::RX_WOW },
{ "randomx", "rx", Algorithm::RX_WOW },
{ "RandomWOW", nullptr, Algorithm::RX_WOW },
{ "randomx/loki", "rx/loki", Algorithm::RX_LOKI },
{ "RandomXL", nullptr, Algorithm::RX_LOKI },
# endif
};

View File

@@ -69,7 +69,9 @@ public:
CN_PICO_0, // "cn-pico" CryptoNight Turtle (TRTL)
# endif
# ifdef XMRIG_ALGO_RANDOMX
RX_0, // "rx/0" RandomX (reference configuration)
RX_WOW, // "rx/wow" RandomWOW (Wownero)
RX_LOKI, // "rx/loki" RandomXL (Loki)
# endif
MAX
};