summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/dri-swrast
diff options
context:
space:
mode:
authorJosé Fonseca <[email protected]>2010-04-10 03:01:30 +0100
committerJosé Fonseca <[email protected]>2010-04-11 17:17:35 +0900
commit47a89e9255846f55efe0992c94b65ae7c911dbb3 (patch)
tree91e7ccf0cb9136189b3ae44bd5c7333a8446f7c8 /src/gallium/targets/dri-swrast
parent21780adc2ed1b10c5c4c71427b8212b8464d065d (diff)
scons: Always build softpipe and llvmpipe (when llvm available).
These are our reference software rasterizers. They can build everywhere and are a precious debugging tool. Making them always present immensily simplifies the scons logic. If people want to avoid building it is still possible to pass direcotries and target names to scons to narrow the build.
Diffstat (limited to 'src/gallium/targets/dri-swrast')
-rw-r--r--src/gallium/targets/dri-swrast/SConscript8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gallium/targets/dri-swrast/SConscript b/src/gallium/targets/dri-swrast/SConscript
index 9a3838d64e2..77f44384d06 100644
--- a/src/gallium/targets/dri-swrast/SConscript
+++ b/src/gallium/targets/dri-swrast/SConscript
@@ -1,9 +1,5 @@
Import('*')
-if not set(('softpipe', 'llvmpipe')).intersection(env['drivers']):
- print 'warning: no supported pipe driver: skipping build of swrastg_dri.so'
- Return()
-
env = drienv.Clone()
env.Append(CPPPATH = [
@@ -20,11 +16,11 @@ env.Prepend(LIBS = [
COMMON_DRI_SW_OBJECTS
])
-if 'softpipe' in env['drivers']:
+if True:
env.Append(CPPDEFINES = 'GALLIUM_SOFTPIPE')
env.Prepend(LIBS = [softpipe])
-if 'llvmpipe' in env['drivers']:
+if env['llvm']:
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')
env.Tool('udis86')
env.Prepend(LIBS = [llvmpipe])