Merge branch '7.8'

[mesa.git] / src / mesa / SConscript

diff --git a/src/mesa/SConscript b/src/mesa/SConscript
index 424232a1d21b7408687647e33e95b8eb1253fef7..690fa6d1970a64c127b18e598ecb397abd8e17f2 100644 (file)
--- a/src/mesa/SConscript
+++ b/src/mesa/SConscript
@@ -182,7 +182,6 @@ 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',
@@ -357,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')