From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Fri, 25 Apr 2008 16:14:32 +0000 (+0900)
Subject: scons: A few fixes for building mesa on windows.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=658f5e721316f1983ae39b6b94b992baca0e2bc2;p=mesa.git

scons: A few fixes for building mesa on windows.
---

diff --git a/SConstruct b/SConstruct
index ea624b13a70..e7c10fcf527 100644
--- a/SConstruct
+++ b/SConstruct
@@ -108,12 +108,6 @@ env.Append(CPPPATH = [
 
 # x86 assembly
 if x86:
-	env.Append(CPPDEFINES = [
-		'USE_X86_ASM', 
-		'USE_MMX_ASM',
-		'USE_3DNOW_ASM',
-		'USE_SSE_ASM',
-	])
 	if gcc:	
 		env.Append(CFLAGS = '-m32')
 		env.Append(CXXFLAGS = '-m32')
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 80fbdb41f05..6b99dacf2a6 100644
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -12,9 +12,19 @@ env.Append(CPPPATH = [
 	'#/src/mesa/main',
 ])
 
-env.Append(CFLAGS = [
-	'-std=c99',
-])
+if gcc:
+	env.Append(CFLAGS = [
+		'-std=c99',
+	])
+
+# x86 assembly
+if x86 and gcc:
+	env.Append(CPPDEFINES = [
+		'USE_X86_ASM', 
+		'USE_MMX_ASM',
+		'USE_3DNOW_ASM',
+		'USE_SSE_ASM',
+	])
 
 
 #######################################################################
@@ -269,7 +279,7 @@ SPARC_API = [
 	'sparc/glapi_sparc.S',
 ]
 
-if x86:
+if x86 and gcc:
 	ASM_SOURCES = ASM_C_SOURCES + X86_SOURCES 
 	API_SOURCES = X86_API
 else: