From f8840057710041e2d43fddfe4ef9f392c475e129 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Fri, 16 Nov 2012 23:35:42 -0800 Subject: [PATCH] scons: Append x11 library path if linking x11 library. Signed-off-by: Vinson Lee --- 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(+) 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, -- 2.30.2