[vlc-commits] opengl: makefile.am: clean opengl targets
Alexandre Janniaux
git at videolan.org
Fri Jan 29 11:06:24 UTC 2021
vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Thu Jan 28 12:11:13 2021 +0100| [16e577ca70efaa1ab7c08525efd3d071c263b234] | committer: Alexandre Janniaux
opengl: makefile.am: clean opengl targets
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=16e577ca70efaa1ab7c08525efd3d071c263b234
---
modules/video_output/opengl/Makefile.am | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/modules/video_output/opengl/Makefile.am b/modules/video_output/opengl/Makefile.am
index 9e08ec09fc..76f6df47a0 100644
--- a/modules/video_output/opengl/Makefile.am
+++ b/modules/video_output/opengl/Makefile.am
@@ -55,7 +55,7 @@ endif
### OpenGL ###
libgles2_plugin_la_SOURCES = video_output/opengl/display.c
libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2
-libgles2_plugin_la_LIBADD = $(GLES2_LIBS) libvlc_opengles.la
+libgles2_plugin_la_LIBADD = libvlc_opengles.la
libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
if HAVE_GLES2
vout_LTLIBRARIES += libgles2_plugin.la
@@ -64,10 +64,6 @@ endif
libgl_plugin_la_SOURCES = video_output/opengl/display.c
libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) $(OPENGL_COMMONCFLAGS)
libgl_plugin_la_LIBADD = libvlc_opengl.la
-if HAVE_WIN32
-libgl_plugin_la_CFLAGS += -DHAVE_GL_CORE_SYMBOLS
-libgl_plugin_la_LIBADD += $(GL_LIBS)
-endif
if HAVE_GL
vout_LTLIBRARIES += libgl_plugin.la
More information about the vlc-commits
mailing list