Mesa (master): i965g: Enable llvm in dri driver if built

[Jakob Bornecrantz]

Module: Mesa
Branch: master
Commit: 0697d41fce6e7cad4badc54cecdd25f1f312c93f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0697d41fce6e7cad4badc54cecdd25f1f312c93f

Author: Jakob Bornecrantz <jakob at vmware.com>
Date:   Thu Jul 22 21:50:27 2010 -0700

i965g: Enable llvm in dri driver if built

---

 src/gallium/targets/dri-i965/Makefile |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/gallium/targets/dri-i965/Makefile b/src/gallium/targets/dri-i965/Makefile
index 3679c07..4b50d04 100644
--- a/src/gallium/targets/dri-i965/Makefile
+++ b/src/gallium/targets/dri-i965/Makefile
@@ -6,10 +6,11 @@ LIBNAME = i965_dri.so
 PIPE_DRIVERS = \
 	$(TOP)/src/gallium/state_trackers/dri/drm/libdridrm.a \
 	$(TOP)/src/gallium/winsys/i965/drm/libi965drm.a \
-	$(TOP)/src/gallium/drivers/trace/libtrace.a \
-	$(TOP)/src/gallium/drivers/rbug/librbug.a \
 	$(TOP)/src/gallium/winsys/sw/wrapper/libwsw.a \
 	$(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a \
+	$(TOP)/src/gallium/drivers/galahad/libgalahad.a \
+	$(TOP)/src/gallium/drivers/trace/libtrace.a \
+	$(TOP)/src/gallium/drivers/rbug/librbug.a \
 	$(TOP)/src/gallium/drivers/i965/libi965.a
 
 C_SOURCES = \
@@ -18,7 +19,11 @@ C_SOURCES = \
 	$(DRIVER_SOURCES)
 
 DRIVER_DEFINES = \
-	-DGALLIUM_SOFTPIPE -DGALLIUM_RBUG -DGALLIUM_TRACE
+	-DGALLIUM_RBUG -DGALLIUM_TRACE -DGALLIUM_GALAHAD -DGALLIUM_SOFTPIPE
+
+ifeq ($(MESA_LLVM),1)
+DRIVER_DEFINES += -DGALLIUM_LLVMPIPE
+endif
 
 include ../Makefile.dri