Mesa (7.11): egl/gallium: fix build without softpipe and llvmpipe

Benjamin Franzke bnf at kemper.freedesktop.org
Wed Jul 27 07:46:02 UTC 2011


Module: Mesa
Branch: 7.11
Commit: 0bfa3100493b01d799361d771a5b1c263e25c280
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0bfa3100493b01d799361d771a5b1c263e25c280

Author: Tobias Droste <tdroste at gmx.de>
Date:   Thu Jul 14 22:32:58 2011 +0200

egl/gallium: fix build without softpipe and llvmpipe

Signed-off-by: Tobias Droste <tdroste at gmx.de>
Acked-by: Jakob Bornecrantz <wallbraker at gmail.com>
Reviewed-by: Marek Olšák <maraeo at gmail.com>
(cherry picked from commit d4d5e3a336f4c1f2208faad57a985f711b09d86d)

---

 src/gallium/targets/egl-static/Makefile |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile
index 69e7eec..5b7b330 100644
--- a/src/gallium/targets/egl-static/Makefile
+++ b/src/gallium/targets/egl-static/Makefile
@@ -141,10 +141,18 @@ egl_LIBS += \
 	$(TOP)/src/gallium/drivers/svga/libsvga.a
 endif
 
-# swrast
+# softpipe
+ifneq ($(findstring softpipe,$(GALLIUM_DRIVERS_DIRS)),)
 egl_CPPFLAGS += -DGALLIUM_SOFTPIPE -DGALLIUM_RBUG -DGALLIUM_TRACE
 egl_LIBS += $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a
 egl_SYS += -lm
+endif
+
+# llvmpipe
+ifneq ($(findstring llvmpipe,$(GALLIUM_DRIVERS_DIRS)),)
+egl_CPPFLAGS += -DGALLIUM_LLVMPIPE
+egl_LIBS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
+endif
 
 # sort to remove duplicates
 egl_CPPFLAGS := $(sort $(egl_CPPFLAGS))
@@ -158,8 +166,6 @@ st_GL_SYS := -lm -lpthread $(DLOPEN_LIBS)
 
 # LLVM
 ifeq ($(MESA_LLVM),1)
-egl_CPPFLAGS += -DGALLIUM_LLVMPIPE
-egl_LIBS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
 egl_SYS += $(LLVM_LIBS)
 LDFLAGS += $(LLVM_LDFLAGS)
 




More information about the mesa-commit mailing list