diff options
| author | Emil Velikov <emil.l.velikov@gmail.com> | 2014-06-21 12:50:10 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2014-07-10 01:06:49 +0100 |
| commit | 0bdc3e1afda111c5741a699da3ff891fedfe89de (patch) | |
| tree | 45b059e54c82c58a9e19a5ff6bc76530c91520c5 /src/gallium/targets/dri/SConscript | |
| parent | 29ca7d2c9488d13e496ec65b6e1e1bf1d53042c5 (diff) | |
| download | external_mesa3d-0bdc3e1afda111c5741a699da3ff891fedfe89de.zip external_mesa3d-0bdc3e1afda111c5741a699da3ff891fedfe89de.tar.gz external_mesa3d-0bdc3e1afda111c5741a699da3ff891fedfe89de.tar.bz2 | |
targets/dri-swrast: Convert to static/shared pipe-driver
Convert the final dri target to the single DRI (megadriver) library.
Cleanup all the automake leftovers from the conversion stage and
update the scons build.
v2: Link in llvmpipe, when applicable.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Tested-by: Rob Clark <robclark@freedesktop.org>
Tested-by: Thomas Helland <thomashelland90 at gmail.com>
Acked-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'src/gallium/targets/dri/SConscript')
| -rw-r--r-- | src/gallium/targets/dri/SConscript | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/src/gallium/targets/dri/SConscript b/src/gallium/targets/dri/SConscript index 27e2047..faf370f 100644 --- a/src/gallium/targets/dri/SConscript +++ b/src/gallium/targets/dri/SConscript @@ -18,11 +18,16 @@ if env['build'] == 'release': env.Append(CPPDEFINES = ['GALLIUM_RBUG']) env.Prepend(LIBS = [rbug]) else: - env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD', 'GALLIUM_SOFTPIPE']) - env.Prepend(LIBS = [trace, rbug, galahad, softpipe, ws_wrapper]) + env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_RBUG', 'GALLIUM_GALAHAD']) + env.Prepend(LIBS = [trace, rbug, galahad]) + +if env['llvm']: + env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE') + env.Prepend(LIBS = [llvmpipe]) env.Append(CPPDEFINES = [ 'GALLIUM_VMWGFX', + 'GALLIUM_SOFTPIPE', 'DRI_TARGET', ]) @@ -30,6 +35,8 @@ env.Prepend(LIBS = [ st_dri, svgadrm, svga, + ws_dri, + softpipe, libloader, mesa, glsl, @@ -39,9 +46,15 @@ env.Prepend(LIBS = [ ]) module = env.LoadableModule( - target = 'vmwgfx_dri.so', + target = 'gallium_dri.so', source = 'target.c', SHLIBPREFIX = '', ) +# vmwgfx_dri.so +env.Command('vmwgfx_dri.so', 'gallium_dri.so', "ln -f ${SOURCE} ${TARGET}") +# swrast_dri.so +env.Command('swrast_dri.so', 'gallium_dri.so', "ln -f ${SOURCE} ${TARGET}") + env.Alias('dri-vmwgfx', module) +env.Alias('dri-swrast', module) |