[vlc-commits] freetype: Makefile: Don't link with libc++ when unrequired

Hugo Beauzée-Luyssen git at videolan.org
Fri Dec 30 15:38:00 CET 2016


vlc | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Fri Dec 30 15:02:11 2016 +0100| [8c295c79d404841bbe66c35d9916e8e8f9be3cfb] | committer: Hugo Beauzée-Luyssen

freetype: Makefile: Don't link with libc++ when unrequired

Fix #17827

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

 modules/text_renderer/Makefile.am | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/modules/text_renderer/Makefile.am b/modules/text_renderer/Makefile.am
index fef32da..ac09caa 100644
--- a/modules/text_renderer/Makefile.am
+++ b/modules/text_renderer/Makefile.am
@@ -14,12 +14,15 @@ libfreetype_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(FREETYPE_LDFLAGS) -rpath '$(text
 
 if HAVE_WIN32
 libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/dwrite.cpp
+libfreetype_plugin_la_LINK = $(CXXLINK)
 if HAVE_WIN32_DESKTOP
 libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/win32.c
 libfreetype_plugin_la_LIBADD += -liconv -lz -lgdi32 -lusp10 -luuid
 else
 libfreetype_plugin_la_LIBADD += -ldwrite
 endif
+else
+libfreetype_plugin_la_LINK = $(LINK)
 endif
 if HAVE_FONTCONFIG
 libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/fontconfig.c



More information about the vlc-commits mailing list