Mesa (master): targets/egl-static: do not use DRI_LIB_DEPS
Chia-I Wu
olv at kemper.freedesktop.org
Sat Jun 25 09:52:01 UTC 2011
Module: Mesa
Branch: master
Commit: 1e9f0b17365072ef672a7777fddde9d973530581
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1e9f0b17365072ef672a7777fddde9d973530581
Author: Chia-I Wu <olv at lunarg.com>
Date: Sat Jun 25 18:09:18 2011 +0900
targets/egl-static: do not use DRI_LIB_DEPS
It brings in libraries that are not necessarily needed.
---
src/gallium/targets/egl-static/Makefile | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile
index d69fe42..6b5ed60 100644
--- a/src/gallium/targets/egl-static/Makefile
+++ b/src/gallium/targets/egl-static/Makefile
@@ -42,7 +42,7 @@ egl_CPPFLAGS += \
-I$(TOP)/src/egl/main \
-D_EGL_MAIN=_eglMain
egl_LIBS += $(TOP)/src/gallium/state_trackers/egl/libegl.a
-egl_SYS += $(LIBUDEV_LIBS) -lEGL -lm
+egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm
# EGL platforms
ifneq ($(findstring x11, $(EGL_PLATFORMS)),)
@@ -70,7 +70,7 @@ egl_CPPFLAGS += -I$(TOP)/src/mesa $(API_DEFINES)
# make st/mesa built-in when there is a single glapi provider
ifeq ($(SHARED_GLAPI),1)
egl_LIBS += $(TOP)/src/mesa/libmesagallium.a
-egl_SYS += $(DRI_LIB_DEPS) -l$(GLAPI_LIB)
+egl_SYS += -lm -lpthread $(DLOPEN_LIBS) -l$(GLAPI_LIB)
else
egl_CPPFLAGS += -D_EGL_EXTERNAL_GL=1
OUTPUTS += st_GL
@@ -154,7 +154,7 @@ egl_SYS := $(sort $(egl_SYS))
# st_GL, built only when shared glapi is not enabled
st_GL_CPPFLAGS := -I $(TOP)/src/mesa -I$(TOP)/src/gallium/include
st_GL_LIBS := $(TOP)/src/mesa/libmesagallium.a $(GALLIUM_AUXILIARIES)
-st_GL_SYS := $(DRI_LIB_DEPS)
+st_GL_SYS := -lm -lpthread $(DLOPEN_LIBS)
# LLVM
ifeq ($(MESA_LLVM),1)
More information about the mesa-commit
mailing list