lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-05 01:20:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use DYLD variants of LD_PRELOAD etc on macOS

Browse Source
This commit is contained in:
baldurk
2018-09-02 13:35:23 +01:00
parent a35c8513cc
commit 57c118c1e6
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/os/posix/posix_process.cpp
+26 -5
View File
@@ -42,6 +42,20 @@
char **GetCurrentEnvironment();
int GetIdentPort(pid_t childPid);
#if ENABLED(RDOC_APPLE)
#define PRELOAD_ENV_VAR "DYLD_INSERT_LIBRARIES"
#define LIB_PATH_ENV_VAR "DYLD_LIBRARY_PATH"
#define LIB_SUFFIX ".dylib"
#else
#define PRELOAD_ENV_VAR "LD_PRELOAD"
#define LIB_PATH_ENV_VAR "LD_LIBRARY_PATH"
#define LIB_SUFFIX ".so"
#endif
Threading::CriticalSection zombieLock;
std::set<pid_t> children;
@@ -612,14 +626,21 @@ ExecuteResult Process::LaunchAndInjectIntoProcess(const char *app, const char *w
#endif
}
std::string libfile = "librenderdoc" LIB_SUFFIX;
// on macOS, the path must be absolute
#if ENABLED(RDOC_APPLE)
libfile = libpath + "/" + libfile;
#endif
string optstr = opts.EncodeAsString();
modifications.push_back(EnvironmentModification(EnvMod::Append, EnvSep::Platform,
"LD_LIBRARY_PATH", binpath.c_str()));
modifications.push_back(EnvironmentModification(EnvMod::Append, EnvSep::Platform,
"LD_LIBRARY_PATH", libpath.c_str()));
modifications.push_back(
EnvironmentModification(EnvMod::Append, EnvSep::Platform, "LD_PRELOAD", "librenderdoc.so"));
EnvironmentModification(EnvMod::Append, EnvSep::Platform, LIB_PATH_ENV_VAR, binpath.c_str()));
modifications.push_back(
EnvironmentModification(EnvMod::Append, EnvSep::Platform, LIB_PATH_ENV_VAR, libpath.c_str()));
modifications.push_back(
EnvironmentModification(EnvMod::Append, EnvSep::Platform, PRELOAD_ENV_VAR, libfile.c_str()));
modifications.push_back(
EnvironmentModification(EnvMod::Set, EnvSep::NoSep, "RENDERDOC_LOGFILE", logfile));
modifications.push_back(