fix typo: s/Contexts/Surfaces/

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 678e4ad0e825d452be8ca0c1ec574a65a50bef63..6b99dacf2a6e1b6f30711d2b1335959304e3b089 100644 (file)
--- 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',
+       ])
 
 
 #######################################################################
@@ -142,6 +152,8 @@ STATETRACKER_SOURCES = [
        'state_tracker/st_atom_texture.c',
        'state_tracker/st_atom_viewport.c',
        'state_tracker/st_cb_accum.c',
+       'state_tracker/st_cb_bitmap.c',
+       'state_tracker/st_cb_blit.c',
        'state_tracker/st_cb_bufferobjects.c',
        'state_tracker/st_cb_clear.c',
        'state_tracker/st_cb_flush.c',
@@ -154,7 +166,6 @@ STATETRACKER_SOURCES = [
        'state_tracker/st_cb_readpixels.c',
        'state_tracker/st_cb_strings.c',
        'state_tracker/st_cb_texture.c',
-       'state_tracker/st_cache.c',
        'state_tracker/st_context.c',
        'state_tracker/st_debug.c',
        'state_tracker/st_draw.c',
@@ -183,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',
 ]
@@ -220,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',
@@ -268,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: