Demos (master): Commit forgotten build system parts of eglkms patch
Kristian Høgsberg
krh at kemper.freedesktop.org
Mon Jan 10 18:32:56 UTC 2011
Module: Demos
Branch: master
Commit: dae5c9fc45eda303a624c63946cc187ca820532d
URL: http://cgit.freedesktop.org/mesa/demos/commit/?id=dae5c9fc45eda303a624c63946cc187ca820532d
Author: Kristian Høgsberg <krh at bitplanet.net>
Date: Mon Jan 10 13:30:44 2011 -0500
Commit forgotten build system parts of eglkms patch
---
configure.ac | 2 ++
src/egl/opengl/Makefile.am | 10 ++++++++++
2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/configure.ac b/configure.ac
index d6753a9..f186659 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,6 +117,7 @@ PKG_CHECK_MODULES(GLESV1, [glesv1_cm], [glesv1_enabled=yes], [glesv1_enabled=no]
PKG_CHECK_MODULES(GLESV2, [glesv2], [glesv2_enabled=yes], [glesv2_enabled=no])
PKG_CHECK_MODULES(VG, [vg], [vg_enabled=yes], [vg_enabled=no])
PKG_CHECK_MODULES(OSMESA, [osmesa], [osmesa_enabled=yes], [osmesa_enabled=no])
+PKG_CHECK_MODULES(DRM, [libdrm], [drm_enabled=yes], [drm_enabled=no])
dnl The OSMesa .pc uses OSMesa32, while we want to build with other versions
dnl too.
OSMESA32_LIBS=$OSMESA_LIBS
@@ -210,6 +211,7 @@ AM_CONDITIONAL(HAVE_GLUT, test "x$glut_enabled" = "xyes")
AM_CONDITIONAL(HAVE_X11, test "x$x11_enabled" = "xyes")
AM_CONDITIONAL(HAVE_FREETYPE2, test "x$freetype2_enabled" = "xyes")
AM_CONDITIONAL(HAVE_OSMESA, test "x$osmesa_enabled" = "xyes")
+AM_CONDITIONAL(HAVE_DRM, test "x$drm_enabled" = "xyes")
AM_CONDITIONAL(BUILD_GLTRACE, false)
AM_CONDITIONAL(HAVE_MESA_SOURCE, test "x$mesa_source_enabled" = "xyes")
diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am
index 35daba0..0da45d9 100644
--- a/src/egl/opengl/Makefile.am
+++ b/src/egl/opengl/Makefile.am
@@ -42,6 +42,11 @@ EGL_X11_DEMOS = \
xeglthreads
endif
+if HAVE_DRM
+EGL_DRM_DEMOS = \
+ eglkms
+endif
+
if HAVE_EGL
noinst_PROGRAMS = \
demo1 \
@@ -51,6 +56,7 @@ noinst_PROGRAMS = \
eglgears_screen \
egltri_screen \
peglgears \
+ $(EGL_DRM_DEMOS) \
$(EGL_X11_DEMOS)
endif
@@ -70,3 +76,7 @@ egltri_screen_LDADD = ../eglut/libeglut_screen.la
eglgears_x11_LDADD = ../eglut/libeglut_x11.la
egltri_x11_LDADD = ../eglut/libeglut_x11.la
+
+eglkms_SOURCES = eglkms.c
+eglkms_CFLAGS = $(DRM_CFLAGS)
+eglkms_LDADD = $(AM_LDFLAGS) $(DRM_LIBS)
More information about the mesa-commit
mailing list