diff options
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 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') 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 5c042f23e3b..00000000000 --- 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" - |