[Mesa-dev] [PATCH] egl-static: use automake conditionals for defining FEATURE_{GL, ES1, ES2}

[Andreas Boll]

Removes the need of API_DEFINES.

Cc: Brian Paul <brianp at vmware.com>
---

Brian, do you have somewhere an updated branch of your remove-mfeatures work?
I'd like to rebase my remove API_DEFINES patch.

 src/gallium/targets/egl-static/Makefile.am |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am
index 31dbc79..c68ed11 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 \
-- 
1.7.10.4