diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-03-09 17:08:36 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-03-09 17:08:36 +0000 |
| commit | c27ffc5215573d6ff106d4770168117adea884f9 (patch) | |
| tree | 31e3e9cea33ca6dda9106c474c7c8ba45e26f00b | |
| parent | 78d8e6c98a7f679b9468c5255043819a6588846e (diff) | |
scons: Fix the libg-xlib Sconscript.
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index 92e508ee50..efa7e797d1 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -28,35 +28,40 @@ env.Append(CPPPATH = [ env.Append(CPPDEFINES = ['USE_XSHM']) +env.Prepend(LIBS = [ + st_xlib, + ws_xlib, + trace, + identity, + glapi, + mesa, + glsl, + gallium, +]) + sources = [ 'xlib.c', ] -drivers = [trace] - if 'softpipe' in env['drivers']: env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE') - sources += ['xlib_softpipe.c', 'xlib_sw_winsys.c'] - drivers += [softpipe] + env.Prepend(LIBS = [softpipe]) if 'llvmpipe' in env['drivers']: env.Tool('llvm') if 'LLVM_VERSION' in env: env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') env.Tool('udis86') - sources += ['xlib_llvmpipe.c', 'xlib_sw_winsys.c'] - drivers += [llvmpipe] + env.Prepend(LIBS = [llvmpipe]) if 'cell' in env['drivers']: env.Append(CPPDEFINES = 'GALLIUM_CELL') - sources += ['xlib_cell.c'] - drivers += [cell] + env.Prepend(LIBS = [cell]) # TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions libgl = env.SharedLibrary( target ='GL', source = sources, - LIBS = st_xlib + glapi + mesa + glsl + drivers + gallium + env['LIBS'], ) if not env['dri']: |