Skip to content
Snippets Groups Projects
Commit 9c9d8dd4 authored by Khalid Masum's avatar Khalid Masum Committed by Steve Lhomme
Browse files

opengl: Makefile.am: remove emscripten specific gles2 libraries

75b62f44 aims to generalize
HAVE_GLES2 with the introduction of (!HAVE_GL and HAVE_GLES2)
and removes android specific library adding.

However, emscripen, like android falls into this criteria but not
removed. Hence libraries like libvlc_opengles.la is added twice and
causing error: "duplicate symbol" during shared module building.

Fix this by removing emscripten's block of code that causes this.
parent 74d2eed9
Branches master
No related tags found
No related merge requests found
Pipeline #453361 passed with stage
in 4 minutes and 45 seconds
......@@ -139,12 +139,6 @@ libglfilter_mock_plugin_la_LIBADD += libvlc_opengl.la $(GL_LIBS)
noinst_LTLIBRARIES += libglfilter_mock_plugin.la
endif
if HAVE_EMSCRIPTEN
libglfilter_mock_plugin_la_LIBADD += libvlc_opengles.la $(GL_LIBS)
libglfilter_mock_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
noinst_LTLIBRARIES += libglfilter_mock_plugin.la
endif
if HAVE_IOS_OR_TVOS
libglfilter_mock_plugin_la_LIBADD += libvlc_opengles.la $(GLES2_LIBS)
libglfilter_mock_plugin_la_CFLAGS = -DUSE_OPENGL_ES2=1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment