diff --git a/CMakeLists.txt b/CMakeLists.txt index 0da768b2..c8d381d4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,6 +17,7 @@ set(HEADERS src/common/config/CommonConfig.h src/common/config/ConfigLoader.h src/common/config/ConfigWatcher.h + src/common/Platform.h src/common/utils/c_str.h src/common/xmrig.h src/Console.h @@ -51,7 +52,6 @@ set(HEADERS src/net/strategies/FailoverStrategy.h src/net/strategies/SinglePoolStrategy.h src/net/SubmitResult.h - src/Platform.h src/Summary.h src/version.h src/workers/CpuThread.h @@ -91,6 +91,7 @@ set(SOURCES src/common/config/CommonConfig.cpp src/common/config/ConfigLoader.cpp src/common/config/ConfigWatcher.cpp + src/common/Platform.cpp src/Console.cpp src/core/Config.cpp src/core/Controller.cpp @@ -106,7 +107,6 @@ set(SOURCES src/net/strategies/FailoverStrategy.cpp src/net/strategies/SinglePoolStrategy.cpp src/net/SubmitResult.cpp - src/Platform.cpp src/Summary.cpp src/workers/CpuThread.cpp src/workers/DoubleWorker.cpp @@ -130,9 +130,9 @@ if (WIN32) set(SOURCES_OS res/app.rc src/App_win.cpp + src/common/Platform_win.cpp src/Cpu_win.cpp src/Mem_win.cpp - src/Platform_win.cpp ) add_definitions(/DWIN32) @@ -140,16 +140,16 @@ if (WIN32) elseif (APPLE) set(SOURCES_OS src/App_unix.cpp + src/common/Platform_mac.cpp src/Cpu_mac.cpp src/Mem_unix.cpp - src/Platform_mac.cpp ) else() set(SOURCES_OS src/App_unix.cpp + src/common/Platform_unix.cpp src/Cpu_unix.cpp src/Mem_unix.cpp - src/Platform_unix.cpp ) set(EXTRA_LIBS pthread rt) diff --git a/src/App.cpp b/src/App.cpp index 9ac78500..3d0cb3df 100644 --- a/src/App.cpp +++ b/src/App.cpp @@ -28,6 +28,7 @@ #include "api/Api.h" #include "App.h" +#include "common/Platform.h" #include "Console.h" #include "core/Config.h" #include "core/Controller.h" @@ -38,7 +39,6 @@ #include "log/Log.h" #include "Mem.h" #include "net/Network.h" -#include "Platform.h" #include "Summary.h" #include "version.h" #include "workers/Workers.h" diff --git a/src/api/ApiRouter.cpp b/src/api/ApiRouter.cpp index 81f765c5..cb7a8005 100644 --- a/src/api/ApiRouter.cpp +++ b/src/api/ApiRouter.cpp @@ -35,13 +35,13 @@ #include "api/ApiRouter.h" #include "common/api/HttpReply.h" #include "common/api/HttpRequest.h" +#include "common/Platform.h" #include "core/Config.h" #include "core/Controller.h" #include "Cpu.h" #include "interfaces/IThread.h" #include "Mem.h" #include "net/Job.h" -#include "Platform.h" #include "rapidjson/document.h" #include "rapidjson/prettywriter.h" #include "rapidjson/stringbuffer.h" diff --git a/src/Platform.cpp b/src/common/Platform.cpp similarity index 100% rename from src/Platform.cpp rename to src/common/Platform.cpp diff --git a/src/Platform.h b/src/common/Platform.h similarity index 100% rename from src/Platform.h rename to src/common/Platform.h diff --git a/src/Platform_mac.cpp b/src/common/Platform_mac.cpp similarity index 100% rename from src/Platform_mac.cpp rename to src/common/Platform_mac.cpp diff --git a/src/Platform_unix.cpp b/src/common/Platform_unix.cpp similarity index 100% rename from src/Platform_unix.cpp rename to src/common/Platform_unix.cpp diff --git a/src/Platform_win.cpp b/src/common/Platform_win.cpp similarity index 100% rename from src/Platform_win.cpp rename to src/common/Platform_win.cpp diff --git a/src/common/config/ConfigLoader.cpp b/src/common/config/ConfigLoader.cpp index a9c802f6..47c6cdf9 100644 --- a/src/common/config/ConfigLoader.cpp +++ b/src/common/config/ConfigLoader.cpp @@ -34,12 +34,12 @@ #include "common/config/ConfigLoader.h" #include "common/config/ConfigWatcher.h" +#include "common/Platform.h" #include "core/ConfigCreator.h" #include "core/ConfigLoader_platform.h" #include "interfaces/IConfig.h" #include "interfaces/IWatcherListener.h" #include "net/Pool.h" -#include "Platform.h" #include "rapidjson/document.h" #include "rapidjson/error/en.h" #include "rapidjson/filereadstream.h" diff --git a/src/core/Controller.cpp b/src/core/Controller.cpp index 954e5b10..f120c0c1 100644 --- a/src/core/Controller.cpp +++ b/src/core/Controller.cpp @@ -26,6 +26,7 @@ #include "common/config/ConfigLoader.h" +#include "common/Platform.h" #include "core/Config.h" #include "core/Controller.h" #include "Cpu.h" @@ -34,7 +35,6 @@ #include "log/FileLog.h" #include "log/Log.h" #include "net/Network.h" -#include "Platform.h" #ifdef HAVE_SYSLOG_H diff --git a/src/net/strategies/DonateStrategy.cpp b/src/net/strategies/DonateStrategy.cpp index da25e23f..27beae33 100644 --- a/src/net/strategies/DonateStrategy.cpp +++ b/src/net/strategies/DonateStrategy.cpp @@ -22,13 +22,13 @@ */ +#include "common/Platform.h" #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" extern "C" diff --git a/src/net/strategies/FailoverStrategy.cpp b/src/net/strategies/FailoverStrategy.cpp index a4e25277..cef9da0c 100644 --- a/src/net/strategies/FailoverStrategy.cpp +++ b/src/net/strategies/FailoverStrategy.cpp @@ -22,10 +22,10 @@ */ +#include "common/Platform.h" #include "interfaces/IStrategyListener.h" #include "net/Client.h" #include "net/strategies/FailoverStrategy.h" -#include "Platform.h" FailoverStrategy::FailoverStrategy(const std::vector &urls, int retryPause, int retries, IStrategyListener *listener, bool quiet) : diff --git a/src/net/strategies/SinglePoolStrategy.cpp b/src/net/strategies/SinglePoolStrategy.cpp index 8c113d93..c74a794b 100644 --- a/src/net/strategies/SinglePoolStrategy.cpp +++ b/src/net/strategies/SinglePoolStrategy.cpp @@ -22,10 +22,10 @@ */ +#include "common/Platform.h" #include "interfaces/IStrategyListener.h" #include "net/Client.h" #include "net/strategies/SinglePoolStrategy.h" -#include "Platform.h" SinglePoolStrategy::SinglePoolStrategy(const Pool &pool, int retryPause, IStrategyListener *listener, bool quiet) : diff --git a/src/workers/Worker.cpp b/src/workers/Worker.cpp index f9162e3f..30305ac6 100644 --- a/src/workers/Worker.cpp +++ b/src/workers/Worker.cpp @@ -24,9 +24,9 @@ #include +#include "common/Platform.h" #include "Cpu.h" #include "Mem.h" -#include "Platform.h" #include "workers/CpuThread.h" #include "workers/Handle.h" #include "workers/Worker.h"