[vlc-commits] opengl: use OPENGL common rules for Android

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Feb  1 14:51:44 2017 +0100| [11994ce6978862323432cbb37a1f4eef583206aa] | committer: Thomas Guillem

opengl: use OPENGL common rules for Android

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=11994ce6978862323432cbb37a1f4eef583206aa
---

 modules/video_output/Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 708a5b8..b4d455f 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -9,6 +9,9 @@ OPENGL_COMMONLIBS =
 OPENGL_COMMONSOURCES = video_output/opengl/vout_helper.c \
 	video_output/opengl/vout_helper.h video_output/opengl/internal.h \
 	video_output/opengl/converters.c
+if HAVE_ANDROID
+OPENGL_COMMONSOURCES += video_output/opengl/converter_android.c
+endif
 
 if HAVE_DECKLINK
 libdecklinkoutput_plugin_la_SOURCES = video_output/decklink.cpp
@@ -47,9 +50,6 @@ endif
 
 ### OpenGL ###
 libgles2_plugin_la_SOURCES = $(OPENGL_COMMONSOURCES) video_output/opengl/display.c
-if HAVE_ANDROID
-libgles2_plugin_la_SOURCES += video_output/opengl/converter_android.c
-endif
 libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2 \
 	$(OPENGL_COMMONCFLAGS)
 libgles2_plugin_la_LIBADD = $(GLES2_LIBS) $(LIBM) $(OPENGL_COMMONLIBS)