Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

[mesa.git] / src / gallium / winsys / drm / intel / dri / SConscript

diff --git a/src/gallium/winsys/drm/intel/dri/SConscript b/src/gallium/winsys/drm/intel/dri/SConscript
index e14e96e32fd9700b7a8f3fb2cf934a9cdc002b62..b1b654d9f8b0ee0148a3b7a58d971aee757daa12 100644 (file)
--- a/src/gallium/winsys/drm/intel/dri/SConscript
+++ b/src/gallium/winsys/drm/intel/dri/SConscript
@@ -2,15 +2,19 @@ Import('*')
 
 env = drienv.Clone()
 
+env.ParseConfig('pkg-config --cflags --libs libdrm_intel')
+
 drivers = [
+    st_dri,
+    inteldrm,
     softpipe,
-    i915simple,
+    i915,
     trace,
-    inteldrm
 ]
 
-env.SharedLibrary(
+env.LoadableModule(
     target ='i915_dri.so',
     source = COMMON_GALLIUM_SOURCES,
     LIBS = drivers + mesa + auxiliaries + env['LIBS'],
+    SHLIBPREFIX = '',
 )