Mesa (master): egl-static: use automake conditionals for defining FEATURE_{GL,ES1,ES2}
Andreas Boll
ab at kemper.freedesktop.org
Wed May 1 19:39:50 UTC 2013
Module: Mesa
Branch: master
Commit: afa33a001a39c44238ba8fd76f8eeabad041459e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=afa33a001a39c44238ba8fd76f8eeabad041459e
Author: Andreas Boll <andreas.boll.dev at gmail.com>
Date: Wed Apr 17 11:16:27 2013 +0200
egl-static: use automake conditionals for defining FEATURE_{GL,ES1,ES2}
Removes the need of API_DEFINES.
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
src/gallium/targets/egl-static/Makefile.am | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index 789aa30..e5bf7fc 100644
--- a/src/gallium/targets/egl-static/Makefile.am
+++ b/src/gallium/targets/egl-static/Makefile.am
@@ -101,7 +101,7 @@ endif
if HAVE_OPENGL
AM_CPPFLAGS += \
-I$(top_srcdir)/src/mesa \
- $(API_DEFINES)
+ -DFEATURE_GL=1
egl_gallium_la_LIBADD += \
$(top_builddir)/src/mesa/libmesagallium.la
@@ -132,6 +132,16 @@ st_GL_la_LIBADD = \
endif
endif
+if HAVE_OPENGL_ES1
+AM_CPPFLAGS += \
+ -DFEATURE_ES1=1
+endif
+
+if HAVE_OPENGL_ES2
+AM_CPPFLAGS += \
+ -DFEATURE_ES2=1
+endif
+
if HAVE_OPENVG
AM_CPPFLAGS += \
-I$(top_srcdir)/src/gallium/state_trackers/vega \
More information about the mesa-commit
mailing list