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

Fix issues with linux/mac builds

Browse Source
This commit is contained in:
baldurk
2020-12-09 21:57:15 +00:00
parent 8107a7a795
commit f70c5be592
4 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/os/posix/apple/apple_process.cpp
+3 -2
View File
@@ -38,7 +38,7 @@ char **GetCurrentEnvironment()
rdcstr execcmd(const char *cmd)
{
FILE *pipe = popen(cmd, FileIO::ReadText);
FILE *pipe = popen(cmd, "r");
if(!pipe)
return "ERROR";
@@ -183,7 +183,8 @@ bool OSUtility::DebuggerPresent()
rdcstr Process::GetEnvVariable(const rdcstr &name)
{
return getenv(name.c_str());
const char *val = getenv(name.c_str());
return val ? val : rdcstr();
}
uint64_t Process::GetMemoryUsage()
renderdoc/os/posix/ggp/ggp_process.cpp
+2 -1
View File
@@ -194,7 +194,8 @@ bool OSUtility::DebuggerPresent()
rdcstr Process::GetEnvVariable(const rdcstr &name)
{
return getenv(name.c_str());
const char *val = getenv(name.c_str());
return val ? val : rdcstr();
}
uint64_t Process::GetMemoryUsage()
renderdoc/os/posix/ggp/ggp_stringio.cpp
+1 -1
View File
@@ -85,7 +85,7 @@ rdcstr GetAppFolderFilename(const rdcstr &filename)
homedir = getpwuid(getuid())->pw_dir;
}
rdcstr ret = rdcstr(homedir) + "/.renderdoc/";
rdcstr ret = rdcstr(homedir ? homedir : "") + "/.renderdoc/";
mkdir(ret.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
renderdoc/os/posix/linux/linux_process.cpp
+2 -1
View File
@@ -658,7 +658,8 @@ bool OSUtility::DebuggerPresent()
rdcstr Process::GetEnvVariable(const rdcstr &name)
{
return getenv(name.c_str());
const char *val = getenv(name.c_str());
return val ? val : rdcstr();
}
uint64_t Process::GetMemoryUsage()