Steve Lhomme pushed to branch master at VideoLAN / VLC
Commits:
9c9d8dd4 by Khalid Masum at 2024-03-28T09:58:59+00:00
opengl: Makefile.am: remove emscripten specific gles2 libraries
75b62f44d8d08aac581e67dea4b4658b3736ce9f 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.
- - - - -
1 changed file:
- modules/video_output/opengl/Makefile.am
Changes:
=====================================
modules/video_output/opengl/Makefile.am
=====================================
@@ -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
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/9c9d8dd47aa7e506e70533f95af769de5329c822
--
View it on GitLab:
https://code.videolan.org/videolan/vlc/-/commit/9c9d8dd47aa7e506e70533f95af769de5329c822
You're receiving this email because of your account on code.videolan.org.
VideoLAN code repository instance
_______________________________________________
vlc-commits mailing list
vlc-commits@videolan.org
https://mailman.videolan.org/listinfo/vlc-commits
