Merge branch 'gallium-msaa'

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index a7572af45d4189d9ceaff88911b3b2879f517fff..b553804fcdc838cf07432d3c6d82b72c76e32d24 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -9,6 +9,7 @@ if env['platform'] != 'winddk':
        env = env.Clone()
        
        env.Append(CPPPATH = [
+               '#/src/mapi',
                '#/src/mesa',
        ])
        
@@ -78,7 +79,6 @@ if env['platform'] != 'winddk':
                'main/polygon.c',
                'main/queryobj.c',
                'main/rastpos.c',
-               'main/rbadaptors.c',
                'main/readpix.c',
                'main/remap.c',
                'main/renderbuffer.c',
@@ -177,6 +177,7 @@ if env['platform'] != 'winddk':
                'state_tracker/st_cb_readpixels.c',
                'state_tracker/st_cb_strings.c',
                'state_tracker/st_cb_texture.c',
+               'state_tracker/st_cb_xformfb.c',
                'state_tracker/st_context.c',
                'state_tracker/st_debug.c',
                'state_tracker/st_draw.c',
@@ -249,16 +250,6 @@ if env['platform'] != 'winddk':
                slang_sources
        )
 
-       glapi_sources = [
-               'glapi/glapi.c',
-               'glapi/glapi_dispatch.c',
-               'glapi/glapi_entrypoint.c',
-               'glapi/glapi_execmem.c',
-               'glapi/glapi_getproc.c',
-               'glapi/glapi_nop.c',
-               'glapi/glthread.c',
-       ]
-       
        #
        # Assembly sources
        #
@@ -292,9 +283,6 @@ if env['platform'] != 'winddk':
                        'x86/sse_normal.S',
                        'x86/read_rgba_span_x86.S',
                ]
-               glapi_sources += [
-                       'x86/glapi_x86.S',
-               ]
        elif gcc and env['machine'] == 'x86_64':
                env.Append(CPPDEFINES = [
                        'USE_X86_64_ASM', 
@@ -303,9 +291,6 @@ if env['platform'] != 'winddk':
                        'x86-64/x86-64.c',
                        'x86-64/xform4.S',
                ]
-               glapi_sources += [
-                       'x86-64/glapi_x86-64.S'
-               ]
        elif gcc and env['machine'] == 'ppc':
                env.Append(CPPDEFINES = [
                        'USE_PPC_ASM', 
@@ -314,8 +299,6 @@ if env['platform'] != 'winddk':
                mesa_sources += [
                        'ppc/common_ppc.c',
                ]
-               glapi_sources += [
-               ]
        elif gcc and env['machine'] == 'sparc':
                mesa_sources += [
                        'sparc/sparc.c',
@@ -323,9 +306,6 @@ if env['platform'] != 'winddk':
                        'sparc/norm.S',
                        'sparc/xform.S',
                ]
-               glapi_sources += [
-                       'sparc/glapi_sparc.S'
-               ]
        else:
                pass
        
@@ -356,10 +336,3 @@ if env['platform'] != 'winddk':
                source = mesa_sources,
        )
        Export('mesa')
-       
-       glapi = env.ConvenienceLibrary(
-               target = 'glapi',
-               source = glapi_sources,
-       )
-       Export('glapi')
-