[vlc-devel] [RFC PATCH 7/8] opengl: add OPENGL_DISPLAY_CFLGS/LIBS mk rules
Thomas Guillem
thomas at gllm.fr
Fri Feb 10 11:36:01 CET 2017
---
modules/video_output/Makefile.am | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index ab41458bb8..eb9dedf0af 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -2,6 +2,8 @@ voutdir = $(pluginsdir)/video_output
vout_LTLIBRARIES =
EXTRA_DIST += video_output/README
+OPENGL_DISPLAY_CFLGS =
+OPENGL_DISPLAY_LIBS =
OPENGL_DISPLAY_SRCS = video_output/opengl/vout_helper.c \
video_output/opengl/vout_helper.h video_output/opengl/internal.h \
video_output/opengl/converters.c
@@ -43,16 +45,16 @@ endif
### OpenGL ###
libgles2_plugin_la_SOURCES = $(OPENGL_DISPLAY_SRCS) video_output/opengl/display.c
-libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2
-libgles2_plugin_la_LIBADD = $(GLES2_LIBS) $(LIBM)
+libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES2 $(OPENGL_DISPLAY_CFLGS)
+libgles2_plugin_la_LIBADD = $(GLES2_LIBS) $(LIBM) $(OPENGL_DISPLAY_LIBS)
libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libgles2_plugin.la
vout_LTLIBRARIES += $(LTLIBgles2)
libgl_plugin_la_SOURCES = $(OPENGL_DISPLAY_SRCS) video_output/opengl/display.c
-libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
-libgl_plugin_la_LIBADD = $(GL_LIBS) $(LIBM)
+libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS) $(OPENGL_DISPLAY_CFLGS)
+libgl_plugin_la_LIBADD = $(GL_LIBS) $(LIBM) $(OPENGL_DISPLAY_LIBS)
if HAVE_GL
vout_LTLIBRARIES += libgl_plugin.la
endif
--
2.11.0
More information about the vlc-devel
mailing list