[vlc-commits] text_renderer: Pass FREETYPE_LIBS as the last library
Hugo Beauzée-Luyssen
git at videolan.org
Tue Apr 11 09:43:05 CEST 2017
vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Apr 11 09:41:40 2017 +0200| [7be1a6a3f43385d1b6c767b657cf577aa863af79] | committer: Hugo Beauzée-Luyssen
text_renderer: Pass FREETYPE_LIBS as the last library
Fix win32 build
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7be1a6a3f43385d1b6c767b657cf577aa863af79
---
modules/text_renderer/Makefile.am | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/modules/text_renderer/Makefile.am b/modules/text_renderer/Makefile.am
index e64bd4659d..c69fc7167a 100644
--- a/modules/text_renderer/Makefile.am
+++ b/modules/text_renderer/Makefile.am
@@ -9,7 +9,7 @@ libfreetype_plugin_la_SOURCES = \
text_renderer/freetype/text_layout.c text_renderer/freetype/text_layout.h
libfreetype_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS)
-libfreetype_plugin_la_LIBADD = $(LIBM) $(FREETYPE_LIBS)
+libfreetype_plugin_la_LIBADD = $(LIBM)
libfreetype_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(FREETYPE_LDFLAGS) -rpath '$(textdir)'
if HAVE_WIN32
@@ -44,6 +44,7 @@ if HAVE_HARFBUZZ
libfreetype_plugin_la_CPPFLAGS += $(HARFBUZZ_CFLAGS) -DHAVE_HARFBUZZ
libfreetype_plugin_la_LIBADD += $(HARFBUZZ_LIBS)
endif
+libfreetype_plugin_la_LIBADD += $(FREETYPE_LIBS)
if HAVE_FREETYPE
text_LTLIBRARIES += libfreetype_plugin.la
endif
More information about the vlc-commits
mailing list