[Mesa-dev] [PATCH] egl/gallium: Set defines for supported APIs when using automake

[Niels Ole Salscheider]

On Tuesday 10 June 2014, 16:18:56, Emil Velikov wrote:
> On 10/06/14 15:17, Niels Ole Salscheider wrote:
> > This fixes automake builds which are broken since
> > b52a530ce2aada1967bc8fefa83ab53e6a737dae.
> 
> Not sure what I was smoking with the above mentioned patch.
> Seem like I've completely forgotten about automake :\
> 
> Niels can you please drop the FEATURE* defines from
> src/gallium/targets/egl-static/Makefile.am

I think they are still necessary since src/gallium/targets/egl-static/egl_st.c 
contains these flags, too... Or am I missing something?
I have seen that you removed them in b52a530ce2aada1967bc8fefa83ab53e6a737dae 
for the other build systems...
 
> With that fixed
> 
> Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=79885
> Reviewed-by: Emil Velikov <emil.l.velikov at gmail.com>
> 
> Thanks
> Emil
> 
> > Signed-off-by: Niels Ole Salscheider <niels_ole at salscheider-online.de>
> > ---
> > 
> >  src/gallium/state_trackers/egl/Makefile.am | 20 ++++++++++++++++++++
> >  1 file changed, 20 insertions(+)
> > 
> > diff --git a/src/gallium/state_trackers/egl/Makefile.am
> > b/src/gallium/state_trackers/egl/Makefile.am index b7dcdab..828bf13
> > 100644
> > --- a/src/gallium/state_trackers/egl/Makefile.am
> > +++ b/src/gallium/state_trackers/egl/Makefile.am
> > @@ -88,3 +88,23 @@ AM_CPPFLAGS += \
> > 
> >  	-I$(top_srcdir)/src/gallium/winsys/sw \
> >  	-DHAVE_NULL_BACKEND
> >  
> >  endif
> > 
> > +
> > +if HAVE_OPENGL
> > +AM_CPPFLAGS += \
> > +	-DFEATURE_GL=1
> > +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 += \
> > +	-DFEATURE_VG=1
> > +endif