Mesa (master): st/egl: Link egl-apis to LLVM when enabled.
Chia-I Wu
olv at kemper.freedesktop.org
Wed May 12 07:52:09 UTC 2010
Module: Mesa
Branch: master
Commit: 084eadac88fd27386539d36d1e382c8bbd15194c
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=084eadac88fd27386539d36d1e382c8bbd15194c
Author: Chia-I Wu <olv at lunarg.com>
Date: Wed May 12 15:46:57 2010 +0800
st/egl: Link egl-apis to LLVM when enabled.
This is required when a client API (i.e. OpenGL) uses the draw module.
---
src/gallium/targets/egl-apis/Makefile | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/src/gallium/targets/egl-apis/Makefile b/src/gallium/targets/egl-apis/Makefile
index 878254c..88915bf 100644
--- a/src/gallium/targets/egl-apis/Makefile
+++ b/src/gallium/targets/egl-apis/Makefile
@@ -21,6 +21,16 @@ GLESv1_CM_SYS := -lpthread -lm -L$(TOP)/$(LIB_DIR) -l$(GLESv1_CM_LIB)
GLESv2_SYS := -lpthread -lm -L$(TOP)/$(LIB_DIR) -l$(GLESv2_LIB)
OpenVG_SYS := -lm -L$(TOP)/$(LIB_DIR) -l$(VG_LIB)
+# $(LLVM_LIBS) will be discarded except for OpenGL, which creates a private
+# draw context for selection/feedback mode.
+ifeq ($(MESA_LLVM),1)
+GL_SYS += $(LLVM_LIBS)
+GLESv1_CM_SYS += $(LLVM_LIBS)
+GLESv2_SYS += $(LLVM_LIBS)
+OpenVG_SYS += $(LLVM_LIBS)
+LDFLAGS += $(LLVM_LDFLAGS)
+endif
+
# project libs
GL_LIBS := $(TOP)/src/mesa/libmesagallium.a
GLESv1_CM_LIBS := $(TOP)/src/mesa/libes1gallium.a
More information about the mesa-commit
mailing list