[vlc-commits] opengl: fix linking
Rémi Denis-Courmont
git at videolan.org
Sun Aug 14 21:11:16 CEST 2016
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Aug 14 22:10:57 2016 +0300| [615ab7c9fc52c6f680645b4fb1b6d8da2f5312d0] | committer: Rémi Denis-Courmont
opengl: fix linking
Regression from 63337cab3bc1aa3391721372c27ded107767ea4c
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=615ab7c9fc52c6f680645b4fb1b6d8da2f5312d0
---
modules/video_output/Makefile.am | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 9898cee..963047b 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -36,13 +36,13 @@ endif
libgles2_plugin_la_SOURCES = video_output/opengl.c video_output/opengl.h \
video_output/gl.c
libgles2_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES2_CFLAGS) -DUSE_OPENGL_ES=2
-libgles2_plugin_la_LIBADD = $(GLES2_LIBS)
+libgles2_plugin_la_LIBADD = $(GLES2_LIBS) $(LIBM)
libgles2_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
libgles1_plugin_la_SOURCES = video_output/opengl.c video_output/opengl.h \
video_output/gl.c
libgles1_plugin_la_CFLAGS = $(AM_CFLAGS) $(GLES1_CFLAGS) -DUSE_OPENGL_ES=1
-libgles1_plugin_la_LIBADD = $(GLES1_LIBS)
+libgles1_plugin_la_LIBADD = $(GLES1_LIBS) $(LIBM)
libgles1_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(voutdir)'
EXTRA_LTLIBRARIES += libgles2_plugin.la libgles1_plugin.la
@@ -51,7 +51,7 @@ vout_LTLIBRARIES += $(LTLIBgles2) $(LTLIBgles1)
libgl_plugin_la_SOURCES = video_output/opengl.c video_output/opengl.h \
video_output/gl.c
libgl_plugin_la_CFLAGS = $(AM_CFLAGS) $(GL_CFLAGS)
-libgl_plugin_la_LIBADD = $(GL_LIBS)
+libgl_plugin_la_LIBADD = $(GL_LIBS) $(LIBM)
if HAVE_GL
vout_LTLIBRARIES += libgl_plugin.la
endif
@@ -87,7 +87,7 @@ libxcb_glx_plugin_la_SOURCES = \
libxcb_glx_plugin_la_CFLAGS = $(AM_CFLAGS) \
$(XCB_CFLAGS) $(GL_CFLAGS)
libxcb_glx_plugin_la_LIBADD = libvlc_xcb_events.la \
- $(XCB_LIBS) $(GL_LIBS)
+ $(XCB_LIBS) $(GL_LIBS) $(LIBM)
libxcb_window_plugin_la_SOURCES = \
video_output/xcb/keys.c \
More information about the vlc-commits
mailing list