[vlc-commits] [Git][videolan/vlc][master] 2 commits: video_output: add missing libandroid_utils.la

[Jean-Baptiste Kempf]

Jean-Baptiste Kempf pushed to branch master at VideoLAN / VLC


Commits:
ccfb2293 by Alexandre Janniaux at 2021-06-25T08:37:52+00:00
video_output: add missing libandroid_utils.la

- - - - -
9f90545d by Alexandre Janniaux at 2021-06-25T08:37:52+00:00
opengl: add missing libandroid_utils.la

- - - - -


2 changed files:

- modules/video_output/Makefile.am
- modules/video_output/opengl/Makefile.am


Changes:

=====================================
modules/video_output/Makefile.am
=====================================
@@ -248,7 +248,7 @@ endif
 
 libegl_android_plugin_la_SOURCES = video_output/opengl/egl.c
 libegl_android_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS) -DUSE_PLATFORM_ANDROID=1
-libegl_android_plugin_la_LIBADD = $(EGL_LIBS)
+libegl_android_plugin_la_LIBADD = $(EGL_LIBS) libandroid_utils.la
 
 libandroid_window_plugin_la_SOURCES = video_output/android/window.c
 libandroid_window_plugin_la_CFLAGS = $(AM_CFLAGS)
@@ -261,6 +261,7 @@ libandroid_display_plugin_la_LIBADD = libandroid_utils.la $(LIBDL)
 libglinterop_android_plugin_la_SOURCES = video_output/opengl/interop_android.c \
 	video_output/opengl/interop.h
 libglinterop_android_plugin_la_CFLAGS = $(AM_CFLAGS) -DUSE_OPENGL_ES2
+libglinterop_android_plugin_la_LIBADD = libandroid_utils.la
 
 if HAVE_ANDROID
 vout_LTLIBRARIES += libandroid_window_plugin.la libandroid_display_plugin.la


=====================================
modules/video_output/opengl/Makefile.am
=====================================
@@ -125,7 +125,7 @@ endif
 
 libegl_surfacetexture_plugin_la_SOURCES = video_filter/egl_surfacetexture.c
 libegl_surfacetexture_plugin_la_CFLAGS = $(AM_CFLAGS) $(EGL_CFLAGS) -DUSE_OPENGL_ES2
-libegl_surfacetexture_plugin_la_LIBADD = $(EGL_LIBS)
+libegl_surfacetexture_plugin_la_LIBADD = $(EGL_LIBS) libandroid_utils.la libvlc_opengles.la
 
 if HAVE_ANDROID
 if HAVE_EGL



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/65a32a68d11d18ca6fcc843ea6a13aaeeb2813fb...9f90545da55ea58dba0ad3fb537858c90a23f738

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/65a32a68d11d18ca6fcc843ea6a13aaeeb2813fb...9f90545da55ea58dba0ad3fb537858c90a23f738
You're receiving this email because of your account on code.videolan.org.