summaryrefslogtreecommitdiff
path: root/src/mesa
diff options
context:
space:
mode:
authorJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-19 15:07:53 +0900
committerJosé Fonseca <jrfonseca@tungstengraphics.com>2008-02-19 15:07:53 +0900
commitb9da3791c934e05b82063a8c79c423a0a8e29a94 (patch)
tree2dce15e3f3d6df353a7f144afa9acb78c177ee5f /src/mesa
parent5d78212d752e021555356bbb9cc5993ad6d9e847 (diff)
Remove src/mesa and src/mesa/main from gallium source include paths.
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/SConscript7
-rw-r--r--src/mesa/x86/common_x86_asm.S2
2 files changed, 8 insertions, 1 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index a828133580..db18c61fac 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -4,6 +4,13 @@
Import('*')
+env = env.Clone()
+
+# Includes
+env.Append(CPPPATH = [
+ '#/src/mesa',
+ '#/src/mesa/main',
+])
#######################################################################
# Core sources
diff --git a/src/mesa/x86/common_x86_asm.S b/src/mesa/x86/common_x86_asm.S
index ef3cc9eb59..09c86b05ba 100644
--- a/src/mesa/x86/common_x86_asm.S
+++ b/src/mesa/x86/common_x86_asm.S
@@ -39,7 +39,7 @@
* in there will break the build on some platforms.
*/
-#include "matypes.h"
+#include "assyntax.h"
#include "common_x86_features.h"
SEG_TEXT