Mesa (master): gallium: Add llvmpipe support to st/egl.

[Chia-I Wu]

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

Author: Chia-I Wu <olv at lunarg.com>
Date:   Tue May 11 12:36:49 2010 +0800

gallium: Add llvmpipe support to st/egl.

Update Makefile rules for st/egl.

---

 configure.ac                     |    2 +-
 src/gallium/targets/Makefile.dri |    1 -
 src/gallium/targets/Makefile.egl |    6 ++++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index c40c842..83aa31d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1448,7 +1448,7 @@ if test "x$enable_gallium_llvm" = xyes; then
 	fi
 	LLVM_LDFLAGS=`$LLVM_CONFIG --ldflags`
 	GALLIUM_DRIVERS_DIRS="$GALLIUM_DRIVERS_DIRS llvmpipe"
-	DEFINES="$DEFINES -DMESA_LLVM -D__STDC_CONSTANT_MACROS"
+	DEFINES="$DEFINES -DGALLIUM_LLVMPIPE -D__STDC_CONSTANT_MACROS"
 	MESA_LLVM=1
     else
 	MESA_LLVM=0
diff --git a/src/gallium/targets/Makefile.dri b/src/gallium/targets/Makefile.dri
index 48326e2..3eff075 100644
--- a/src/gallium/targets/Makefile.dri
+++ b/src/gallium/targets/Makefile.dri
@@ -1,7 +1,6 @@
 # -*-makefile-*-
 
 ifeq ($(MESA_LLVM),1)
-DRIVER_DEFINES += -DGALLIUM_LLVMPIPE
 PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 LDFLAGS += $(LLVM_LDFLAGS)
 LD = g++
diff --git a/src/gallium/targets/Makefile.egl b/src/gallium/targets/Makefile.egl
index 7e65411..604841f 100644
--- a/src/gallium/targets/Makefile.egl
+++ b/src/gallium/targets/Makefile.egl
@@ -23,6 +23,12 @@ x11_ST = $(TOP)/src/gallium/state_trackers/egl/libeglx11.a \
 
 x11_LIBS = $(common_LIBS) -lX11 -lXext -lXfixes
 
+ifeq ($(MESA_LLVM),1)
+x11_ST += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
+x11_LIBS += $(LLVM_LIBS)
+LDFLAGS += $(LLVM_LDFLAGS)
+endif
+
 kms_ST = $(TOP)/src/gallium/state_trackers/egl/libeglkms.a
 kms_LIBS = $(common_LIBS)