diff options
| author | Kristian Høgsberg <krh@bitplanet.net> | 2011-01-10 13:30:44 -0500 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2011-01-10 13:30:44 -0500 |
| commit | dae5c9fc45eda303a624c63946cc187ca820532d (patch) | |
| tree | 64b2d26a66d0b00ce1312e26c80f8bcddc13c5c3 | |
| parent | 5ed40f47466aad8fd21889cb905ab429d111b086 (diff) | |
Commit forgotten build system parts of eglkms patch
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/egl/opengl/Makefile.am | 10 |
2 files changed, 12 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index d6753a92..f1866590 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 35daba0a..0da45d95 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) |