summaryrefslogtreecommitdiffstats
path: root/src/gallium/targets/libgl-gdi
diff options
context:
space:
mode:
Diffstat (limited to 'src/gallium/targets/libgl-gdi')
-rw-r--r--src/gallium/targets/libgl-gdi/SConscript10
-rw-r--r--src/gallium/targets/libgl-gdi/glsl_types_hack.cpp3
2 files changed, 12 insertions, 1 deletions
diff --git a/src/gallium/targets/libgl-gdi/SConscript b/src/gallium/targets/libgl-gdi/SConscript
index 594f34d7fad..eb777a86cb2 100644
--- a/src/gallium/targets/libgl-gdi/SConscript
+++ b/src/gallium/targets/libgl-gdi/SConscript
@@ -7,6 +7,10 @@ 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',
])
@@ -20,7 +24,11 @@ env.Append(LIBS = [
env.Prepend(LIBS = [mesautil])
-sources = ['libgl_gdi.c']
+sources = [
+ 'libgl_gdi.c',
+ 'glsl_types_hack.cpp'
+]
+
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
new file mode 100644
index 00000000000..5c042f23e3b
--- /dev/null
+++ b/src/gallium/targets/libgl-gdi/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"
+