summaryrefslogtreecommitdiff
path: root/cli
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2013-10-28 15:38:42 +0000
committerJosé Fonseca <jfonseca@vmware.com>2013-10-28 15:38:42 +0000
commit60054362291e059d86edfbe5c5cb33b74a1a1378 (patch)
tree131f4f5c2867695b31ab6f9bb0fcc9e274baa69f /cli
parent2926190052f1ff36ec0d0f9e18885f83ebbca13c (diff)
cgltrace: Use DYLD_FRAMEWORK_PATH instead of DYLD_LIBRARY_PATH.
It seems that from MacOSX 10.9 DYLD_FRAMEWORK_PATH takes precendence over DYLD_LIBRARY_PATH for frameworks. Issue #181.
Diffstat (limited to 'cli')
-rw-r--r--cli/cli_trace.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/cli/cli_trace.cpp b/cli/cli_trace.cpp
index 2b7d5b68..60111d05 100644
--- a/cli/cli_trace.cpp
+++ b/cli/cli_trace.cpp
@@ -41,8 +41,8 @@
#if defined(__APPLE__)
-#define TRACE_VARIABLE "DYLD_LIBRARY_PATH"
-#define GL_TRACE_WRAPPER "OpenGL"
+#define TRACE_VARIABLE "DYLD_FRAMEWORK_PATH"
+#define GL_TRACE_WRAPPER "OpenGL.framework/OpenGL"
#elif defined(_WIN32)
#define GL_TRACE_WRAPPER "opengl32.dll"
#else
@@ -169,7 +169,8 @@ traceProgram(trace::API api,
#if defined(__APPLE__)
/* On Mac OS X, using DYLD_LIBRARY_PATH, we actually set the
- * directory, not the file. */
+ * parent directory, not the file. */
+ wrapperPath.trimFilename();
wrapperPath.trimFilename();
#endif