Mesa (master): scons: Append x11 library path if linking x11 library.
Vinson Lee
vlee at kemper.freedesktop.org
Thu Nov 22 06:35:05 UTC 2012
Module: Mesa
Branch: master
Commit: f8840057710041e2d43fddfe4ef9f392c475e129
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=f8840057710041e2d43fddfe4ef9f392c475e129
Author: Vinson Lee <vlee at freedesktop.org>
Date: Fri Nov 16 23:35:42 2012 -0800
scons: Append x11 library path if linking x11 library.
Signed-off-by: Vinson Lee <vlee at freedesktop.org>
---
src/gallium/targets/graw-xlib/SConscript | 1 +
src/gallium/targets/libgl-xlib/SConscript | 1 +
src/mesa/drivers/x11/SConscript | 1 +
3 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/src/gallium/targets/graw-xlib/SConscript b/src/gallium/targets/graw-xlib/SConscript
index a535f31..9cbe7bb 100644
--- a/src/gallium/targets/graw-xlib/SConscript
+++ b/src/gallium/targets/graw-xlib/SConscript
@@ -11,6 +11,7 @@ env.Prepend(LIBS = [
])
env.Append(LIBS = env['X11_LIBS'])
+env.Append(LIBPATH = env['X11_LIBPATH'])
env.Append(CPPPATH = [
'#src/gallium/drivers',
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript
index 1b92c30..dc1ce89 100644
--- a/src/gallium/targets/libgl-xlib/SConscript
+++ b/src/gallium/targets/libgl-xlib/SConscript
@@ -15,6 +15,7 @@ env.Append(CPPPATH = [
env.Append(CPPDEFINES = ['USE_XSHM'])
env.Prepend(LIBS = env['X11_LIBS'])
+env.Prepend(LIBPATH = env['X11_LIBPATH'])
# when GLES is enabled, gl* and _glapi_* belong to bridge_glapi and
# shared_glapi respectively
diff --git a/src/mesa/drivers/x11/SConscript b/src/mesa/drivers/x11/SConscript
index cfa2815..984e6ce 100644
--- a/src/mesa/drivers/x11/SConscript
+++ b/src/mesa/drivers/x11/SConscript
@@ -11,6 +11,7 @@ env.Append(CPPPATH = [
env.Append(CPPDEFINES = ['USE_XSHM'])
env.Prepend(LIBS = env['X11_LIBS'])
+env.Prepend(LIBPATH = env['X11_LIBPATH'])
env.Prepend(LIBS = [
glapi,
More information about the mesa-commit
mailing list