Merge branch 'xa_branch'

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

diff --git a/src/gallium/targets/dri-i965/SConscript b/src/gallium/targets/dri-i965/SConscript
index eb9e6cd172ab15e86eef439fa710c59c95c64935..01a458db228def930fb491256985b87317db3183 100644 (file)
--- a/src/gallium/targets/dri-i965/SConscript
+++ b/src/gallium/targets/dri-i965/SConscript
@@ -1,26 +1,32 @@
 Import('*')
 
-if not 'i965' in env['drivers']:
-    print 'warning: i965 pipe driver not built skipping i965_dri.so'
-    Return()
-
 env = drienv.Clone()
 
-env.ParseConfig('pkg-config --cflags --libs libdrm_intel')
+env.PkgUseModules('DRM_INTEL')
+
+env.Append(CPPDEFINES = [
+    'GALLIUM_SOFTPIPE',
+    'GALLIUM_RBUG',
+    'GALLIUM_TRACE'
+])
 
 env.Prepend(LIBS = [
     st_dri,
     i965drm,
+    ws_wrapper,
     i965,
     trace,
+    rbug,
     mesa,
     glsl,
     gallium,
     COMMON_DRI_DRM_OBJECTS
 ])
 
-env.LoadableModule(
+module = env.LoadableModule(
     target = 'i965_dri.so',
-    source = 'dummy.c',
+    source = 'target.c',
     SHLIBPREFIX = '',
 )
+
+env.Alias('dri-i965', module)