summaryrefslogtreecommitdiff
path: root/src/mesa/SConscript
diff options
context:
space:
mode:
authorBen Skeggs <skeggsb@gmail.com>2008-04-27 18:04:50 +1000
committerBen Skeggs <skeggsb@gmail.com>2008-04-27 18:04:50 +1000
commit0cca90cea1dbe1a76dbf9ac1985c3676ec460b0a (patch)
tree6e496a5d77d13a9f1679006c3c5334e0b8d889f4 /src/mesa/SConscript
parent7342688286cc3b7c938af2dfeac22df4fa8c8464 (diff)
parenta8e39b6f5a1fedf2f8719e1adb8802ebbfc09688 (diff)
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/mesa/SConscript')
-rw-r--r--src/mesa/SConscript18
1 files changed, 14 insertions, 4 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 80fbdb41f0..6b99dacf2a 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: