summaryrefslogtreecommitdiff
path: root/src/mesa/SConscript
diff options
context:
space:
mode:
Diffstat (limited to 'src/mesa/SConscript')
-rw-r--r--src/mesa/SConscript20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index b816a21b38..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',
+ ])
#######################################################################
@@ -184,6 +194,7 @@ SHADER_SOURCES = [
'shader/prog_parameter.c',
'shader/prog_print.c',
'shader/prog_statevars.c',
+ 'shader/prog_uniform.c',
'shader/programopt.c',
'shader/shader_api.c',
]
@@ -221,7 +232,6 @@ ASM_C_SOURCES = [
'x86/x86.c',
'x86/3dnow.c',
'x86/sse.c',
- 'x86/rtasm/x86sse.c',
'sparc/sparc.c',
'ppc/common_ppc.c',
'x86-64/x86-64.c',
@@ -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: