Merge branch '7.8'

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 9c933adcf7d66066a6ef3d6684d5e9f63f09f3a1..424232a1d21b7408687647e33e95b8eb1253fef7 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -103,7 +103,9 @@ if env['platform'] != 'winddk':
                'main/texrender.c',
                'main/texstate.c',
                'main/texstore.c',
+               'main/transformfeedback.c',
                'main/varray.c',
+               'main/version.c',
                'main/viewport.c',
                'main/vtxfmt.c',
        ]
@@ -165,6 +167,7 @@ if env['platform'] != 'winddk':
                'state_tracker/st_cb_condrender.c',
                'state_tracker/st_cb_flush.c',
                'state_tracker/st_cb_drawpixels.c',
+               'state_tracker/st_cb_eglimage.c',
                'state_tracker/st_cb_fbo.c',
                'state_tracker/st_cb_feedback.c',
                'state_tracker/st_cb_program.c',
@@ -173,7 +176,6 @@ 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_viewport.c',
                'state_tracker/st_context.c',
                'state_tracker/st_debug.c',
                'state_tracker/st_draw.c',
@@ -182,6 +184,7 @@ if env['platform'] != 'winddk':
                'state_tracker/st_format.c',
                'state_tracker/st_framebuffer.c',
                'state_tracker/st_gen_mipmap.c',
+               'state_tracker/st_manager.c',
                'state_tracker/st_mesa_to_tgsi.c',
                'state_tracker/st_program.c',
                'state_tracker/st_texture.c',
@@ -247,9 +250,12 @@ if env['platform'] != 'winddk':
        )
 
        glapi_sources = [
-               'main/dispatch.c',
                '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',
        ]