gallium: Add llvmpipe support to st/egl.

Update Makefile rules for st/egl.

diff --git a/configure.ac b/configure.ac
index c40c84269509c04178bd486150ec7344e7b84116..83aa31d3bdef6036f0565468859ef75e8759e49b 100644 (file)
--- 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 48326e209e31714176def28bb4442dc2cc42e160..3eff07538fe4024045d899f20ea7a623cb13f88b 100644 (file)
--- 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 7e65411e9825e4c54f0caedb7242cbf891b586a9..604841f710a8cb9f06788ca0ca5ec3f4bd212ab8 100644 (file)
--- 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)