github-jwinterm/xmr-stak
1
0
Fork 0
mirror of https://github.com/jwinterm/xmr-stak.git synced 2026-10-17 05:41:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #86 from psychocrypt/topic-searchBackendLibraries

Browse Source 
search for linux backend plugins
This commit is contained in:
fireice-uk
2017-11-02 18:18:49 +00:00
committed by GitHub
parent bc18ee3fd7 14f041a971
commit 11f1028782
3 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
xmrstak/backend/plugin.hpp
+8 -1
View File
@@ -43,7 +43,14 @@ struct plugin
// `.dylib` Mac OS X file extention for dynamic libraries
fileExtension = ".dylib";
# endif
libBackend = dlopen((params::inst().executablePrefix + "/lib" + libName + fileExtension).c_str(), RTLD_LAZY);
// search library in working directory
libBackend = dlopen(("./lib" + libName + fileExtension).c_str(), RTLD_LAZY);
// fallback to binary directory
if(!libBackend)
libBackend = dlopen((params::inst().executablePrefix + "lib" + libName + fileExtension).c_str(), RTLD_LAZY);
// try use LD_LIBRARY_PATH
if(!libBackend)
libBackend = dlopen(("lib" + libName + fileExtension).c_str(), RTLD_LAZY);
if(!libBackend)
{
std::cerr << "WARNING: "<< m_backendName <<" cannot load backend library: " << dlerror() << std::endl;
xmrstak/cli/cli-miner.cpp
+8 -2
View File
@@ -106,15 +106,21 @@ int main(int argc, char *argv[])
using namespace xmrstak;
std::string pathWithName(argv[0]);
auto pos = pathWithName.rfind("/");
std::string seperator("/");
auto pos = pathWithName.rfind(seperator);
if(pos == std::string::npos)
{
// try windows "\"
pos = pathWithName.rfind("\\");
seperator = "\\";
pos = pathWithName.rfind(seperator);
}
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);
params::inst().executablePrefix += seperator;
}
bool userSetPasswd = false;
for(int i = 1; i < argc; ++i)
xmrstak/params.hpp
+1 -1
View File
@@ -37,7 +37,7 @@ struct params
params() :
binaryName("xmr-stak"),
executablePrefix("./"),
executablePrefix(""),
useAMD(true),
useNVIDIA(true),
useCPU(true),