From 33ceb6716a2166db75659fa66d85fb4cfb9633c7 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Mon, 18 Feb 2008 10:52:44 +0000
Subject: Update scons build for new code layout.

---
 src/gallium/winsys/dri/intel/SConscript | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'src/gallium/winsys/dri/intel/SConscript')

diff --git a/src/gallium/winsys/dri/intel/SConscript b/src/gallium/winsys/dri/intel/SConscript
index a7cc10450e..525ba580e8 100644
--- a/src/gallium/winsys/dri/intel/SConscript
+++ b/src/gallium/winsys/dri/intel/SConscript
@@ -9,11 +9,6 @@ env.Append(CPPPATH = [
 
 #MINIGLX_SOURCES = server/intel_dri.c
 
-pipe_drivers = [
-	softpipe,
-	i915simple
-]
-
 DRIVER_SOURCES = [
 	'intel_winsys_pipe.c',
 	'intel_winsys_softpipe.c',
@@ -31,11 +26,14 @@ sources = \
 	COMMON_BM_SOURCES + \
 	DRIVER_SOURCES
 
-# DRIVER_DEFINES = -I../intel $(shell pkg-config libdrm --atleast-version=2.3.1 \
-#				&& echo "-DDRM_VBLANK_FLIP=DRM_VBLANK_FLIP")
+drivers = [
+	softpipe,
+	i915simple
+]
 
+# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions
 env.SharedLibrary(
 	target ='i915tex_dri.so',
 	source = sources,
-	LIBS = pipe_drivers + env['LIBS'],
+	LIBS = mesa + drivers + auxiliaries + env['LIBS'],
 )
\ No newline at end of file
-- 
cgit v1.2.3