trace: Only close trace files on exit.

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

diff --git a/src/gallium/targets/SConscript.dri b/src/gallium/targets/SConscript.dri
index 101863a68489c3dd9775da2b04bd4b793e3d811c..04c8ec789f83b762b2c93bf469785b0f5f0d780f 100644 (file)
--- a/src/gallium/targets/SConscript.dri
+++ b/src/gallium/targets/SConscript.dri
@@ -10,6 +10,7 @@ drienv = env.Clone()
 
 drienv.Replace(CPPPATH = [
     '#src/mesa/drivers/dri/common',
+    xmlpool_options.dir.dir, # Dir to generated xmlpool/options.h
     '#include',
     '#include/GL/internal',
     '#src/mapi',
@@ -29,7 +30,7 @@ drienv.Replace(CPPPATH = [
     '#src/egl/drivers/dri',
 ])
 
-drienv.ParseConfig('pkg-config --cflags --libs libdrm')
+drienv.PkgUseModules('DRM')
 
 dri_common_utils = drienv.SharedObject(
     target = 'utils.o',
@@ -41,11 +42,6 @@ dri_common_xmlconfig = drienv.SharedObject(
     source = '#src/mesa/drivers/dri/common/xmlconfig.c'
 )
 
-dri_common_vblank = drienv.SharedObject(
-    target = 'vblank.o',
-    source = '#src/mesa/drivers/dri/common/vblank.c'
-)
-
 dri_common_dri_util = drienv.SharedObject(
     target = 'dri_util.o',
     source = '#src/mesa/drivers/dri/common/dri_util.c'
@@ -66,7 +62,6 @@ COMMON_DRI_SW_OBJECTS = [
 COMMON_DRI_DRM_OBJECTS = [
     dri_common_utils,
     dri_common_xmlconfig,
-    dri_common_vblank,
     dri_common_dri_util,
 ]