diff --git a/CMakeLists.txt b/CMakeLists.txt index 096fa97f2..97d3e51b9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -18,6 +18,7 @@ set(HEADERS src/common/config/ConfigLoader.h src/common/config/ConfigWatcher.h src/common/utils/c_str.h + src/common/xmrig.h src/Console.h src/core/Config.cpp src/core/ConfigLoader_platform.h @@ -60,7 +61,6 @@ set(HEADERS src/workers/SingleWorker.h src/workers/Worker.h src/workers/Workers.h - src/xmrig.h ) set(HEADERS_CRYPTO diff --git a/src/Cpu.h b/src/Cpu.h index 118c7b7d3..e739ccce4 100644 --- a/src/Cpu.h +++ b/src/Cpu.h @@ -28,7 +28,7 @@ #include <stdint.h> -#include "xmrig.h" +#include "common/xmrig.h" class Cpu diff --git a/src/Mem.h b/src/Mem.h index 73947b42d..06b470c8f 100644 --- a/src/Mem.h +++ b/src/Mem.h @@ -30,7 +30,7 @@ #include <stdint.h> -#include "xmrig.h" +#include "common/xmrig.h" struct cryptonight_ctx; diff --git a/src/Mem_win.cpp b/src/Mem_win.cpp index ec30e3e82..1f3066ea3 100644 --- a/src/Mem_win.cpp +++ b/src/Mem_win.cpp @@ -34,10 +34,10 @@ # include <malloc.h> #endif -#include "log/Log.h" +#include "common/xmrig.h" #include "crypto/CryptoNight.h" +#include "log/Log.h" #include "Mem.h" -#include "xmrig.h" /***************************************************************** diff --git a/src/common/config/CommonConfig.cpp b/src/common/config/CommonConfig.cpp index 6902b7a24..2cce845cc 100644 --- a/src/common/config/CommonConfig.cpp +++ b/src/common/config/CommonConfig.cpp @@ -36,7 +36,6 @@ #include "rapidjson/document.h" #include "rapidjson/filewritestream.h" #include "rapidjson/prettywriter.h" -#include "xmrig.h" xmrig::CommonConfig::CommonConfig() : diff --git a/src/common/config/CommonConfig.h b/src/common/config/CommonConfig.h index f4cf4b437..5a229269e 100644 --- a/src/common/config/CommonConfig.h +++ b/src/common/config/CommonConfig.h @@ -29,9 +29,9 @@ #include "common/utils/c_str.h" +#include "common/xmrig.h" #include "interfaces/IConfig.h" #include "net/Pool.h" -#include "xmrig.h" namespace xmrig { diff --git a/src/xmrig.h b/src/common/xmrig.h similarity index 100% rename from src/xmrig.h rename to src/common/xmrig.h diff --git a/src/core/Config.cpp b/src/core/Config.cpp index ee305091a..07f111925 100644 --- a/src/core/Config.cpp +++ b/src/core/Config.cpp @@ -35,7 +35,6 @@ #include "rapidjson/filewritestream.h" #include "rapidjson/prettywriter.h" #include "workers/CpuThread.h" -#include "xmrig.h" static char affinity_tmp[20] = { 0 }; diff --git a/src/core/Config.h b/src/core/Config.h index 999f30599..fd33b614f 100644 --- a/src/core/Config.h +++ b/src/core/Config.h @@ -30,8 +30,8 @@ #include "common/config/CommonConfig.h" +#include "common/xmrig.h" #include "rapidjson/fwd.h" -#include "xmrig.h" class Addr; diff --git a/src/crypto/CryptoNight_constants.h b/src/crypto/CryptoNight_constants.h index 60f0df087..3c746d47a 100644 --- a/src/crypto/CryptoNight_constants.h +++ b/src/crypto/CryptoNight_constants.h @@ -29,7 +29,7 @@ #include <stdint.h> -#include "xmrig.h" +#include "common/xmrig.h" namespace xmrig diff --git a/src/interfaces/IThread.h b/src/interfaces/IThread.h index e2325c729..5b3efa0de 100644 --- a/src/interfaces/IThread.h +++ b/src/interfaces/IThread.h @@ -27,8 +27,8 @@ #include <stdint.h> +#include "common/xmrig.h" #include "rapidjson/fwd.h" -#include "xmrig.h" namespace xmrig { diff --git a/src/net/Job.h b/src/net/Job.h index e89643140..a60f061ce 100644 --- a/src/net/Job.h +++ b/src/net/Job.h @@ -30,8 +30,8 @@ #include <stdint.h> +#include "common/xmrig.h" #include "net/Id.h" -#include "xmrig.h" class Job diff --git a/src/net/Pool.h b/src/net/Pool.h index aff1ea318..ecce865a7 100644 --- a/src/net/Pool.h +++ b/src/net/Pool.h @@ -29,7 +29,7 @@ #include "common/utils/c_str.h" -#include "xmrig.h" +#include "common/xmrig.h" class Pool diff --git a/src/net/strategies/DonateStrategy.cpp b/src/net/strategies/DonateStrategy.cpp index 311ca4241..da25e23f1 100644 --- a/src/net/strategies/DonateStrategy.cpp +++ b/src/net/strategies/DonateStrategy.cpp @@ -22,13 +22,13 @@ */ +#include "common/xmrig.h" #include "interfaces/IStrategyListener.h" #include "net/Client.h" #include "net/Job.h" #include "net/strategies/DonateStrategy.h" #include "net/strategies/FailoverStrategy.h" #include "Platform.h" -#include "xmrig.h" extern "C" diff --git a/src/workers/CpuThread.h b/src/workers/CpuThread.h index aef73719c..dadd0424b 100644 --- a/src/workers/CpuThread.h +++ b/src/workers/CpuThread.h @@ -25,8 +25,8 @@ #define __CPUTHREAD_H__ +#include "common/xmrig.h" #include "interfaces/IThread.h" -#include "xmrig.h" struct cryptonight_ctx;