summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/osmesa/SConscript
diff options
context:
space:
mode:
authorJose Fonseca <[email protected]>2015-10-19 14:29:28 +0100
committerJose Fonseca <[email protected]>2015-10-19 15:59:59 +0100
commitb23a4859f4dbbcca7d6a637010167d470211e45b (patch)
tree6e47c0a14c1766befc7c051a1e69a5d2700e4a92 /src/gallium/targets/osmesa/SConscript
parent530eb39c71d2f42ef5d6c556aff77c322434f4e2 (diff)
scons: Build nir/glsl_types.cpp once.
Undoes early hacks, and ensures nir/glsl_types.cpp is built once, and only once. The root problem is that SCons doesn't know about NIR nor any source file in the NIR_FILES source list. Tested with libgl-gdi and libgl-xlib scons targets. Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/gallium/targets/osmesa/SConscript')
-rw-r--r--src/gallium/targets/osmesa/SConscript7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gallium/targets/osmesa/SConscript b/src/gallium/targets/osmesa/SConscript
index 78930a98e03..4a9115ba1cf 100644
--- a/src/gallium/targets/osmesa/SConscript
+++ b/src/gallium/targets/osmesa/SConscript
@@ -5,8 +5,6 @@ env = env.Clone()
env.Prepend(CPPPATH = [
'#src/mapi',
'#src/mesa',
- '#src/glsl',
- '#src/glsl/nir',
#Dir('../../../mapi'), # src/mapi build path for python-generated GL API files/headers
])
@@ -24,10 +22,7 @@ env.Prepend(LIBS = [
env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_SOFTPIPE'])
-sources = [
- 'target.c',
- 'glsl_types_hack.cpp'
-]
+sources = ['target.c']
if env['llvm']:
env.Append(CPPDEFINES = 'GALLIUM_LLVMPIPE')