Demos (master): opengles2: fix building without X11
Emil Velikov
evelikov at kemper.freedesktop.org
Wed Feb 18 11:06:02 UTC 2015
Module: Demos
Branch: master
Commit: 6f7ad3f242943242021d1c42c6ed6933b76137fd
URL: http://cgit.freedesktop.org/mesa/demos/commit/?id=6f7ad3f242943242021d1c42c6ed6933b76137fd
Author: Michael Olbrich <m.olbrich at pengutronix.de>
Date: Thu Jan 22 18:28:08 2015 +0000
opengles2: fix building without X11
es2_info, es2gears_x11 and es2tri require X11, so don't build them if X11
is disabled.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=88618
Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>
---
src/egl/opengles2/Makefile.am | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/egl/opengles2/Makefile.am b/src/egl/opengles2/Makefile.am
index 41c1b80..36d6059 100644
--- a/src/egl/opengles2/Makefile.am
+++ b/src/egl/opengles2/Makefile.am
@@ -36,10 +36,13 @@ AM_LDFLAGS = \
if HAVE_EGL
if HAVE_GLESV2
bin_PROGRAMS = \
+ es2gears_screen
+if HAVE_X11
+bin_PROGRAMS += \
es2_info \
- es2gears_screen \
es2gears_x11 \
es2tri
+endif
if HAVE_WAYLAND
bin_PROGRAMS += es2gears_wayland
endif
More information about the mesa-commit
mailing list