Mesa (master): scons: Fix xlib build.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Mon Dec 28 22:54:50 UTC 2009
Module: Mesa
Branch: master
Commit: 7abdaf574a31f4f09b20a6bc59bdb1bbebf9b15b
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=7abdaf574a31f4f09b20a6bc59bdb1bbebf9b15b
Author: José Fonseca <jfonseca at vmware.com>
Date: Mon Dec 28 15:22:17 2009 +0000
scons: Fix xlib build.
After glsl rework merge.
---
src/gallium/winsys/xlib/SConscript | 2 +-
src/glsl/SConscript | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gallium/winsys/xlib/SConscript b/src/gallium/winsys/xlib/SConscript
index dfe550f..7a9e985 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 101487d..8e18626 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,
)
More information about the mesa-commit
mailing list