Merge branch '7.8'

[mesa.git] / src / gallium / targets / SConscript.dri

diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index 621924058079d62856f590fe6a8e2afdd57c8069..28fbe02ab8d57092c3bc3d4e3044ae86d5daaedf 100644 (file)
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -46,6 +46,18 @@ dri_common_dri_util = drienv.SharedObject(
        source = '#src/mesa/drivers/dri/common/dri_util.c'
 )
 
+dri_common_drisw_util = drienv.SharedObject(
+       target = 'drisw_util.o',
+       source = '#src/mesa/drivers/dri/common/drisw_util.c'
+)
+
+
+COMMON_DRI_SW_OBJECTS = [
+       dri_common_utils,
+       dri_common_xmlconfig,
+       dri_common_drisw_util,
+]
+
 COMMON_DRI_DRM_OBJECTS = [
        dri_common_utils,
        dri_common_xmlconfig,
@@ -53,11 +65,20 @@ COMMON_DRI_DRM_OBJECTS = [
        dri_common_dri_util,
 ]
 
+drienv.AppendUnique(LIBS = [
+    'expat',
+])
+
 Export([
        'drienv',
+       'COMMON_DRI_SW_OBJECTS',
        'COMMON_DRI_DRM_OBJECTS',
 ])
 
+SConscript([
+       'dri-swrast/SConscript',
+])
+
 if 'vmware' in env['winsys']:
        SConscript([
                'dri-vmwgfx/SConscript',