diff options
| author | Jose Fonseca <jfonseca@vmware.com> | 2015-10-19 14:29:28 +0100 |
|---|---|---|
| committer | Jose Fonseca <jfonseca@vmware.com> | 2015-10-19 15:59:59 +0100 |
| commit | b23a4859f4dbbcca7d6a637010167d470211e45b (patch) | |
| tree | 6e47c0a14c1766befc7c051a1e69a5d2700e4a92 /src/gallium/targets/osmesa | |
| parent | 530eb39c71d2f42ef5d6c556aff77c322434f4e2 (diff) | |
| download | external_mesa3d-b23a4859f4dbbcca7d6a637010167d470211e45b.zip external_mesa3d-b23a4859f4dbbcca7d6a637010167d470211e45b.tar.gz external_mesa3d-b23a4859f4dbbcca7d6a637010167d470211e45b.tar.bz2 | |
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 <brianp@vmware.com>
Diffstat (limited to 'src/gallium/targets/osmesa')
| -rw-r--r-- | src/gallium/targets/osmesa/SConscript | 7 | ||||
| -rw-r--r-- | src/gallium/targets/osmesa/glsl_types_hack.cpp | 3 |
2 files changed, 1 insertions, 9 deletions
diff --git a/src/gallium/targets/osmesa/SConscript b/src/gallium/targets/osmesa/SConscript index 78930a9..4a9115b 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') diff --git a/src/gallium/targets/osmesa/glsl_types_hack.cpp b/src/gallium/targets/osmesa/glsl_types_hack.cpp deleted file mode 100644 index 5c042f2..0000000 --- a/src/gallium/targets/osmesa/glsl_types_hack.cpp +++ /dev/null @@ -1,3 +0,0 @@ -/* errrg scons.. otherwise "scons: *** Two environments with different actions were specified for the same target: $mesa/build/linux-x86_64-debug/glsl/nir/glsl_types.os" */ -#include "glsl_types.cpp" - |