From b2c582aea137c05beeaff3193b16dbd06506e04c Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 18 Mar 2015 23:50:19 +0000 Subject: [PATCH] Fixes for qrenderdoc on linux --- qrenderdoc/qrenderdoc.pro | 1 + renderdoc/os/linux/linux_libentry.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/qrenderdoc/qrenderdoc.pro b/qrenderdoc/qrenderdoc.pro index 7d33da3e2..4306fcfa9 100644 --- a/qrenderdoc/qrenderdoc.pro +++ b/qrenderdoc/qrenderdoc.pro @@ -40,6 +40,7 @@ win32 { # Link against the core library LIBS += -L$$_PRO_FILE_PWD_/../renderdoc -lrenderdoc + QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN\'' } diff --git a/renderdoc/os/linux/linux_libentry.cpp b/renderdoc/os/linux/linux_libentry.cpp index 0e0c6b355..151c847be 100644 --- a/renderdoc/os/linux/linux_libentry.cpp +++ b/renderdoc/os/linux/linux_libentry.cpp @@ -42,7 +42,8 @@ void library_loaded() FileIO::GetExecutableFilename(curfile); if(curfile.find("/renderdoccmd") != string::npos || - curfile.find("/renderdocui") != string::npos) + curfile.find("/renderdocui") != string::npos || + curfile.find("/qrenderdoc") != string::npos) { RDCDEBUG("Not creating hooks - in replay app");