diff options
| -rw-r--r-- | xmrstak/backend/plugin.hpp | 3 | ||||
| -rw-r--r-- | xmrstak/cli/cli-miner.cpp | 8 | ||||
| -rw-r--r-- | xmrstak/params.hpp | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/xmrstak/backend/plugin.hpp b/xmrstak/backend/plugin.hpp index 7a3e6f5..ff7c9d8 100644 --- a/xmrstak/backend/plugin.hpp +++ b/xmrstak/backend/plugin.hpp @@ -1,6 +1,7 @@ #pragma once #include "xmrstak/misc/environment.hpp" +#include "xmrstak/params.hpp" #include <thread> #include <atomic> @@ -36,7 +37,7 @@ struct plugin return; } #else - libBackend = dlopen((std::string("./lib") + libName + ".so").c_str(), RTLD_LAZY); + libBackend = dlopen((params::inst().executablePrefix + "/lib" + libName + ".so").c_str(), RTLD_LAZY); if(!libBackend) { std::cerr << "WARNING: "<< m_backendName <<" cannot load backend library: " << dlerror() << std::endl; diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp index 7e0fc9b..71a1af3 100644 --- a/xmrstak/cli/cli-miner.cpp +++ b/xmrstak/cli/cli-miner.cpp @@ -60,7 +60,8 @@ void help() using namespace std; using namespace xmrstak; - cout<<"Usage: "<<params::inst().executablePrefix<<" [--help|-h] [--benchmark] [-c CONFIGFILE] [CONFIG FILE]"<<endl; + cout<<"Usage: "<<params::inst().binaryName<<" [OPTIONS] [CONFIG FILE]"<<endl; + } int main(int argc, char *argv[]) @@ -85,8 +86,9 @@ int main(int argc, char *argv[]) // try windows "\" pos = pathWithName.rfind("\\"); } - - params::inst().executablePrefix = std::string(pathWithName, 0, pos); + params::inst().binaryName = std::string(pathWithName, pos + 1, std::string::npos); + if(params::inst().binaryName.compare(pathWithName) != 0) + params::inst().executablePrefix = std::string(pathWithName, 0, pos); for(int i = 1; i < argc; ++i) { diff --git a/xmrstak/params.hpp b/xmrstak/params.hpp index 4f161c8..dddf82e 100644 --- a/xmrstak/params.hpp +++ b/xmrstak/params.hpp @@ -19,6 +19,7 @@ struct params } std::string executablePrefix; + std::string binaryName; bool useAMD; bool useNVIDIA; bool useCPU; @@ -33,6 +34,8 @@ struct params std::string configFileCPU; params() : + binaryName("xmr-stak"), + executablePrefix("./"), useAMD(true), useNVIDIA(true), useCPU(true), |
