diff options
| author | Brian Paul <brianp@vmware.com> | 2015-10-17 10:02:04 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2015-10-17 10:06:49 -0600 |
| commit | 3272f632eec768c79000836e9bc45b90229789e7 (patch) | |
| tree | ae8f3fe33f0acfa821559701fc0b63e8b7cea403 /src/gallium/targets/osmesa | |
| parent | 7e6aafd6ab89ad8bc113f67eb666a90b979cdb8e (diff) | |
| download | external_mesa3d-3272f632eec768c79000836e9bc45b90229789e7.zip external_mesa3d-3272f632eec768c79000836e9bc45b90229789e7.tar.gz external_mesa3d-3272f632eec768c79000836e9bc45b90229789e7.tar.bz2 | |
scons: fix MSVC, MinGW build
Duplicate the glsl_types_hack.cpp work-around from the libgl-xlib target.
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, 9 insertions, 1 deletions
diff --git a/src/gallium/targets/osmesa/SConscript b/src/gallium/targets/osmesa/SConscript index 4a9115b..78930a9 100644 --- a/src/gallium/targets/osmesa/SConscript +++ b/src/gallium/targets/osmesa/SConscript @@ -5,6 +5,8 @@ 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 ]) @@ -22,7 +24,10 @@ env.Prepend(LIBS = [ env.Append(CPPDEFINES = ['GALLIUM_TRACE', 'GALLIUM_SOFTPIPE']) -sources = ['target.c'] +sources = [ + 'target.c', + 'glsl_types_hack.cpp' +] 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 new file mode 100644 index 0000000..5c042f2 --- /dev/null +++ b/src/gallium/targets/osmesa/glsl_types_hack.cpp @@ -0,0 +1,3 @@ +/* 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" + |