summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorVinson Lee <[email protected]>2012-11-16 23:35:42 -0800
committerVinson Lee <[email protected]>2012-11-21 22:34:20 -0800
commitf8840057710041e2d43fddfe4ef9f392c475e129 (patch)
tree34bd4202ebcdf45c9783fbd1a8ddfb0029a44fcd /src
parentbf75a1f09211a9ca90b2ea3366b3331919793f9d (diff)
scons: Append x11 library path if linking x11 library.
Signed-off-by: Vinson Lee <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/targets/graw-xlib/SConscript1
-rw-r--r--src/gallium/targets/libgl-xlib/SConscript1
-rw-r--r--src/mesa/drivers/x11/SConscript1
3 files changed, 3 insertions, 0 deletions
diff --git a/src/gallium/targets/graw-xlib/SConscript b/src/gallium/targets/graw-xlib/SConscript
index a535f3168d4..9cbe7bb3c05 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 1b92c307730..dc1ce89ca49 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 cfa2815e297..984e6cef4e8 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,