Merge branch '7.8'

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 0a25dccde56ca4cbae76f06a3910662d3d3666be..690fa6d1970a64c127b18e598ecb397abd8e17f2 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -103,6 +103,7 @@ 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',
@@ -166,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',
@@ -180,8 +182,8 @@ if env['platform'] != 'winddk':
                'state_tracker/st_draw_feedback.c',
                'state_tracker/st_extensions.c',
                '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',
@@ -249,6 +251,8 @@ if env['platform'] != 'winddk':
        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',
@@ -352,10 +356,9 @@ if env['platform'] != 'winddk':
        )
        Export('mesa')
        
-       if not dri:
-               glapi = env.ConvenienceLibrary(
-                       target = 'glapi',
-                       source = glapi_sources,
-               )
-               Export('glapi')
+       glapi = env.ConvenienceLibrary(
+               target = 'glapi',
+               source = glapi_sources,
+       )
+       Export('glapi')