diff options
| author | Jose Fonseca <[email protected]> | 2015-10-19 14:29:28 +0100 |
|---|---|---|
| committer | Jose Fonseca <[email protected]> | 2015-10-19 15:59:59 +0100 |
| commit | b23a4859f4dbbcca7d6a637010167d470211e45b (patch) | |
| tree | 6e47c0a14c1766befc7c051a1e69a5d2700e4a92 /src/gallium/targets/libgl-xlib | |
| parent | 530eb39c71d2f42ef5d6c556aff77c322434f4e2 (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/libgl-xlib')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 3 | ||||
| -rw-r--r-- | src/gallium/targets/libgl-xlib/glsl_types_hack.cpp | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index fedc522fbdc..df5a220ac25 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -6,8 +6,6 @@ Import('*') env = env.Clone() env.Append(CPPPATH = [ - '#/src/glsl', - '#/src/glsl/nir', '#/src/mapi', '#/src/mesa', '#/src/mesa/main', @@ -38,7 +36,6 @@ env.Prepend(LIBS = [ sources = [ 'xlib.c', - 'glsl_types_hack.cpp', ] if True: diff --git a/src/gallium/targets/libgl-xlib/glsl_types_hack.cpp b/src/gallium/targets/libgl-xlib/glsl_types_hack.cpp deleted file mode 100644 index 5c042f23e3b..00000000000 --- a/src/gallium/targets/libgl-xlib/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" - |