X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fgallium%2Fstate_trackers%2Fdri%2FSConscript;h=657300baf1344f619778bc2c49457a8123d8dba5;hb=134728fdaef9d2a5d072d25b31437ac0fecd9076;hp=2ca9f4206839991c3875e5ffb52ea9cf585b8072;hpb=a6fecdff3e71f080d4caf29d2b0713ab5ce9d5f4;p=mesa.git

diff --git a/src/gallium/state_trackers/dri/SConscript b/src/gallium/state_trackers/dri/SConscript
index 2ca9f420683..657300baf13 100644
--- a/src/gallium/state_trackers/dri/SConscript
+++ b/src/gallium/state_trackers/dri/SConscript
@@ -3,25 +3,32 @@
 
 Import('*')
 
-if env['dri']:
-
-    env = env.Clone()
-
-    env.Append(CPPPATH = [
-        '#/src/mesa',
-	'#/src/mesa/drivers/dri/common',
-    ])
-
-    st_dri = env.ConvenienceLibrary(
-	target = 'st_dri',
-	source = [ 'dri_context.c',
-		'dri_drawable.c',
-		'dri_extensions.c',
-		'dri_screen.c',
-		'dri_st_api.c',
-		'dri1_helper.c',
-		'dri1.c',
-		'dri2.c',
-		]
-    )
-    Export('st_dri')
+env = env.Clone()
+
+env.PkgUseModules(['DRM'])
+
+env.Append(CPPPATH = [
+    '#/src',
+    '#/src/mapi',
+    '#/src/mesa',
+    '#/src/mesa/drivers/dri/common',
+    xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
+])
+
+env.Append(CPPDEFINES = [
+    ('GALLIUM_STATIC_TARGETS', '1'),
+])
+
+sources = env.ParseSourceList('Makefile.sources', 'common_SOURCES')
+
+# XXX: if HAVE_DRISW
+sources.append(env.ParseSourceList('Makefile.sources', 'drisw_SOURCES'))
+
+# XXX: if HAVE_DRI2
+sources.append(env.ParseSourceList('Makefile.sources', 'dri2_SOURCES'))
+
+st_dri = env.ConvenienceLibrary(
+    target = 'st_dri',
+    source = sources
+)
+Export('st_dri')