[vlc-devel] [vlc-commits] libvlc: callbacks: compile with the OpenGL C flags (for real)

[Alexandre Janniaux]

Hi,

On Mon, Feb 10, 2020 at 02:52:54PM +0200, Rémi Denis-Courmont wrote:
> Err, I don't think you can have GL and GLES headers simultaneously.

Yes you can, you even probably have on your machine, and if
you enable GLESv2 support you will have both opengl and gles
in VLC on linux.

For android here, GL_CFLAGS will be empty but we probably
want the vgl module to not depends upon GL/GLES headers
anyway in the long run.

Regards,
--
Alexandre Janniaux
Videolabs

>
> Le 10 février 2020 13:52:04 GMT+02:00, Steve Lhomme <git at videolan.org> a écrit :
> >vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Mon Feb 10
> >11:51:49 2020 +0100| [8a54db4ca4c6a591b694a3442ba3c9bcb436a086] |
> >committer: Steve Lhomme
> >
> >libvlc: callbacks: compile with the OpenGL C flags (for real)
> >
> >Android is compiled with OpenGL ES2. We just need the headers anyway.
> >
> >>
> >http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8a54db4ca4c6a591b694a3442ba3c9bcb436a086
> >---
> >
> > modules/video_output/Makefile.am | 5 ++++-
> > 1 file changed, 4 insertions(+), 1 deletion(-)
> >
> >diff --git a/modules/video_output/Makefile.am
> >b/modules/video_output/Makefile.am
> >index 23a5b6809c..bcb19e2949 100644
> >--- a/modules/video_output/Makefile.am
> >+++ b/modules/video_output/Makefile.am
> >@@ -335,7 +335,10 @@ libwextern_plugin_la_SOURCES =
> >video_output/wextern.c
> > libyuv_plugin_la_SOURCES = video_output/yuv.c
> >
> > libvgl_plugin_la_SOURCES = video_output/vgl.c
> >-libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) $(GLES2_CFLAGS)
> >+libvgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
> >+if HAVE_ANDROID
> >+libvgl_plugin_la_CFLAGS += $(GLES2_CFLAGS) -DUSE_OPENGL_ES2
> >+endif
> >
> > vout_LTLIBRARIES += \
> > 	libflaschen_plugin.la \
> >
> >_______________________________________________
> >vlc-commits mailing list
> >vlc-commits at videolan.org
> >https://mailman.videolan.org/listinfo/vlc-commits
>
> --
> Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté.

> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel