From b9da3791c934e05b82063a8c79c423a0a8e29a94 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 19 Feb 2008 15:07:53 +0900
Subject: Remove src/mesa and src/mesa/main from gallium source include paths.

---
 src/mesa/SConscript           | 7 +++++++
 src/mesa/x86/common_x86_asm.S | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/mesa')

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
-- 
cgit v1.2.3