Commit eaa07998 authored by Zhigang Gong's avatar Zhigang Gong
Browse files

glamor: Add device independent glamor to the installation package.



Other ddx driver may link libglamor_dix to utilize glamor.
Signed-off-by: default avatarZhigang Gong <zhigang.gong@linux.intel.com>
parent 1658454d
......@@ -801,7 +801,8 @@ LIBUDEV="libudev >= 143"
LIBSELINUX="libselinux >= 2.0.86"
LIBDBUS="dbus-1 >= 1.0"
LIBPIXMAN="pixman-1 >= 0.21.8"
LIBEGL="egl >= 7.12.0"
LIBGLESV2="glesv2 >= 7.11.0"
dnl Pixman is always required, but we separate it out so we can link
dnl specific modules against it
PKG_CHECK_MODULES(PIXMAN, $LIBPIXMAN)
......@@ -1779,14 +1780,21 @@ GLAMOR=yes
if test "x$GLAMOR" = xyes; then
AC_DEFINE(GLAMOR,1,[Build Glamor])
if test "x$GLAMOR_GLES2" = xyes; then
AC_DEFINE(GLAMOR_GLES2,1,[Build glamor over GLES2])
PKG_CHECK_MODULES(GLESV2, $LIBGLESV2)
REQUIRED_LIBS="$REQUIRED_LIBS $LIBGLESV2"
else
AC_DEFINE(GLAMOR_GL,1,[Build glamor over GL])
PKG_CHECK_MODULES(GL, $LIBGL)
REQUIRED_LIBS="$REQUIRED_LIBS $LIBGL"
fi
if test "x$GLAMOR_DDX" = xyes; then
AC_DEFINE(GLAMOR_DDX,1,[Enable glamor ddx driver])
PKG_CHECK_MODULES(EGL, $LIBEGL)
REQUIRED_LIBS="$REQUIRED_LIBS $LIBEGL"
fi
fi
......
......@@ -9,13 +9,20 @@ sdk_HEADERS = glamor.h
endif
if GLAMOR_GLES2
GLAMOR_GLES2_CFLAGS = -DGLAMOR_GLES2
libglamor_la_LIBADD = $(GLESV2_LIBS)
else
libglamor_la_LIBADD = $(GL_LIBS)
endif
if XORG
sdk_HEADERS = glamor.h
endif
INCLUDES = \
$(XORG_INCS)
AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) $(GLAMOR_GLES2_CFLAGS) $(LIBDRM_CFLAGS)
AM_CFLAGS = $(XORG_CFLAGS) $(DIX_CFLAGS) $(LIBDRM_CFLAGS)
libglamor_la_SOURCES = \
glamor.c \
......@@ -37,4 +44,3 @@ libglamor_la_SOURCES = \
glamor_picture.c\
glamor_window.c\
glamor.h
......@@ -16,7 +16,8 @@ endif
module_LTLIBRARIES = libfb.la \
libwfb.la \
libshadow.la
libshadow.la \
libglamor_dix.la
extsmoduledir = $(moduledir)/extensions
extsmodule_LTLIBRARIES = $(RECORDMOD) \
......@@ -34,6 +35,11 @@ libdbe_la_LDFLAGS = -avoid-version
libdbe_la_LIBADD = $(top_builddir)/dbe/libdbe.la
libdbe_la_SOURCES = dbemodule.c
libglamor_dix_la_LDFLAGS = -avoid-version
libglamor_dix_la_LIBADD = $(top_builddir)/glamor/libglamor.la
libglamor_dix_la_SOURCES =
libglamor_dix_la_CFLAGS = $(AM_CFLAGS)
libfb_la_LDFLAGS = -avoid-version
libfb_la_LIBADD = $(top_builddir)/fb/libfb.la
libfb_la_SOURCES = $(top_builddir)/fb/fbcmap_mi.c fbmodule.c
......
......@@ -13,15 +13,11 @@ glamor_la_CFLAGS = \
if GLAMOR_GLES2
glamor_la_CFLAGS+=-DGLAMOR_GLES2
GLAMOR_GL_LIB = -lGLESv2
else
GLAMOR_GL_LIB = -lGL
endif
glamor_la_LDFLAGS = \
-module -avoid-version -L$(libdir) -lEGL \
$(top_builddir)/glamor/libglamor.la \
-L$(libdir)/../lib64 $(GLAMOR_GL_LIB)
glamor_la_LDFLAGS = -module -avoid-version \
$(top_builddir)/glamor/libglamor.la \
$(EGL_LIBS)
glamor_ladir = $(moduledir)/drivers
glamor_la_SOURCES = \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment