lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-08-03 21:30:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use library location not binary location to locate relative paths

Browse Source 
* This means that things will work successfully even if the 'executable' is
  actually e.g. python3 in a system directory and nowhere related to where the
  renderdoc library is.
This commit is contained in:
baldurk
2018-10-24 15:57:50 +01:00
parent b42931e238
commit afb67f9035
13 changed files with 169 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/android/android_tools.cpp
+4 -4
View File
@@ -249,11 +249,11 @@ std::string getToolPath(ToolDir subdir, const std::string &toolname, bool checkE
// finally try to locate it in our own distributed android subfolder
{
std::string exepath;
FileIO::GetExecutableFilename(exepath);
std::string exedir = dirname(FileIO::GetFullPathname(exepath));
std::string libpath;
FileIO::GetLibraryFilename(libpath);
std::string libdir = dirname(FileIO::GetFullPathname(libpath));
toolpath = exedir + "/plugins/android/" + toolname;
toolpath = libdir + "/plugins/android/" + toolname;
if(toolExists(toolpath))
{
if(toolname == "adb")