Mesa (master): wayland: Fix link order for libwayland-drm.a
Kristian Høgsberg
krh at kemper.freedesktop.org
Wed May 18 23:01:04 UTC 2011
Module: Mesa
Branch: master
Commit: bfaa458445978b5210e6866256d19448db2c6dd0
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bfaa458445978b5210e6866256d19448db2c6dd0
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Mon May 16 16:29:53 2011 -0400
wayland: Fix link order for libwayland-drm.a
---
src/egl/main/Makefile | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/egl/main/Makefile b/src/egl/main/Makefile
index 6c24255..6c4a392 100644
--- a/src/egl/main/Makefile
+++ b/src/egl/main/Makefile
@@ -54,10 +54,6 @@ OBJECTS = $(SOURCES:.c=.o)
LOCAL_CFLAGS = -D_EGL_OS_UNIX=1
LOCAL_LIBS =
-ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
-LOCAL_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a
-endif
-
# egl_dri2 and egl_glx are built-ins
ifeq ($(filter dri2, $(EGL_DRIVERS_DIRS)),dri2)
LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_DRI2
@@ -68,6 +64,10 @@ endif
EGL_LIB_DEPS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) $(LIBDRM_LIB) $(WAYLAND_LIBS)
endif
+ifneq ($(findstring wayland, $(EGL_PLATFORMS)),)
+LOCAL_LIBS += $(TOP)/src/egl/wayland/wayland-drm/libwayland-drm.a
+endif
+
ifeq ($(filter glx, $(EGL_DRIVERS_DIRS)),glx)
LOCAL_CFLAGS += -D_EGL_BUILT_IN_DRIVER_GLX
LOCAL_LIBS += $(TOP)/src/egl/drivers/glx/libegl_glx.a
More information about the mesa-commit
mailing list