From b23a4859f4dbbcca7d6a637010167d470211e45b Mon Sep 17 00:00:00 2001 From: Jose Fonseca Date: Mon, 19 Oct 2015 14:29:28 +0100 Subject: 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 --- src/gallium/targets/libgl-gdi/SConscript | 10 +--------- src/gallium/targets/libgl-gdi/glsl_types_hack.cpp | 3 --- 2 files changed, 1 insertion(+), 12 deletions(-) delete mode 100644 src/gallium/targets/libgl-gdi/glsl_types_hack.cpp (limited to 'src/gallium/targets/libgl-gdi') diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript index eb777a8..594f34d 100644 --- a/src/gallium/targets/libgl-gdi/SConscript +++ b/src/gallium/targets/libgl-gdi/SConscript @@ -7,10 +7,6 @@ env = env.Clone() env.Append(CPPPATH = [ '#src', - '#src/mesa', - '#src/mapi', - '#src/glsl', - '#src/glsl/nir', '#src/gallium/state_trackers/wgl', '#src/gallium/winsys/sw', ]) @@ -24,11 +20,7 @@ env.Append(LIBS = [ env.Prepend(LIBS = [mesautil]) -sources = [ - 'libgl_gdi.c', - 'glsl_types_hack.cpp' -] - +sources = ['libgl_gdi.c'] drivers = [] if True: diff --git a/src/gallium/targets/libgl-gdi/glsl_types_hack.cpp b/src/gallium/targets/libgl-gdi/glsl_types_hack.cpp deleted file mode 100644 index 5c042f2..0000000 --- a/src/gallium/targets/libgl-gdi/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" - -- cgit v1.1