diff options
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, 6 insertions, 0 deletions
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index df5a220..fedc522 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -6,6 +6,8 @@ Import('*') env = env.Clone() env.Append(CPPPATH = [ + '#/src/glsl', + '#/src/glsl/nir', '#/src/mapi', '#/src/mesa', '#/src/mesa/main', @@ -36,6 +38,7 @@ 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 new file mode 100644 index 0000000..5c042f2 --- /dev/null +++ b/src/gallium/targets/libgl-xlib/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" + |