diff options
| author | Jakob Bornecrantz <[email protected]> | 2010-03-26 14:47:20 +0100 |
|---|---|---|
| committer | Jakob Bornecrantz <[email protected]> | 2010-03-26 14:56:26 +0100 |
| commit | e57405e8d516c09b890c6f1c3bd8fe7780417c95 (patch) | |
| tree | 3309702546a78e9649097b9c5925a116950406ed /src/gallium/targets/dri-swrast/SConscript | |
| parent | 7f91f2efb5b92a9ad8506c54643142f40f286d5c (diff) | |
swrastg: Use llvmpipe if built but only on scons
Diffstat (limited to 'src/gallium/targets/dri-swrast/SConscript')
| -rw-r--r-- | src/gallium/targets/dri-swrast/SConscript | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/gallium/targets/dri-swrast/SConscript b/src/gallium/targets/dri-swrast/SConscript index e9f742c43ce..94ff99a0a90 100644 --- a/src/gallium/targets/dri-swrast/SConscript +++ b/src/gallium/targets/dri-swrast/SConscript @@ -1,7 +1,7 @@ Import('*') -if not 'softpipe' in env['drivers']: - print 'warning: softpipe driver not built skipping swrastg_dri.so' +if not set(('softpipe', 'llvmpipe')).intersection(env['drivers']): + print 'warning: no supported pipe driver: skipping build of swrastg_dri.so' Return() env = drienv.Clone() @@ -13,7 +13,6 @@ env.Append(CPPPATH = [ env.Prepend(LIBS = [ st_drisw, ws_dri, - softpipe, trace, mesa, glsl, @@ -21,6 +20,17 @@ env.Prepend(LIBS = [ COMMON_DRI_SW_OBJECTS ]) +if 'softpipe' in env['drivers']: + env.Append(CPPDEFINES = 'GALLIUM_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') + env.Prepend(LIBS = [llvmpipe]) + swrastg_sources = [ 'swrast_drm_api.c' ] |