summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2009-12-28 15:22:17 +0000
committerJosé Fonseca <jfonseca@vmware.com>2009-12-28 22:53:40 +0000
commit7abdaf574a31f4f09b20a6bc59bdb1bbebf9b15b (patch)
tree44e9cd7daabe0b2d19a48a84f61a50a220a57462
parent49a0f291aef5f601f172cf6f41fd83d6c342bb8a (diff)
scons: Fix xlib build.
After glsl rework merge.
-rw-r--r--src/gallium/winsys/xlib/SConscript2
-rw-r--r--src/glsl/SConscript2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index dfe550f733..7a9e985cb5 100644
--- a/src/gallium/winsys/xlib/SConscript
+++ b/src/gallium/winsys/xlib/SConscript
@@ -51,7 +51,7 @@ if env['platform'] == 'linux' \
libgl = env.SharedLibrary(
target ='GL',
source = sources,
- LIBS = st_xlib + glapi + mesa + drivers + auxiliaries + env['LIBS'],
+ LIBS = st_xlib + glapi + mesa + glsl + drivers + auxiliaries + env['LIBS'],
)
env.InstallSharedLibrary(libgl, version=(1, 5))
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 101487df91..8e18626c40 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -23,7 +23,7 @@ sources = [
'cl/sl_cl_parse.c',
]
-glsl = env.StaticLibrary(
+glsl = env.ConvenienceLibrary(
target = 'glsl',
source = sources,
)