vlc | branch: master | David Fuhrmann <[email protected]> | Sun May 27 12:33:36 2018 +0200| [ed600b3efd6b4642f0e0d364f5cbc0cc7b4b1d45] | committer: David Fuhrmann
freetype: Append _LDFLAGS to _LINK for all platforms AM_LDFLAGS needs to be removed as this is already added to the standard LINK flags (and adding those flags twice is not allowed). > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ed600b3efd6b4642f0e0d364f5cbc0cc7b4b1d45 --- modules/text_renderer/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/text_renderer/Makefile.am b/modules/text_renderer/Makefile.am index 41b370788d..62ea43d2fb 100644 --- a/modules/text_renderer/Makefile.am +++ b/modules/text_renderer/Makefile.am @@ -10,7 +10,7 @@ libfreetype_plugin_la_SOURCES = \ libfreetype_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS) libfreetype_plugin_la_LIBADD = $(LIBM) -libfreetype_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(FREETYPE_LDFLAGS) -rpath '$(textdir)' +libfreetype_plugin_la_LDFLAGS = $(FREETYPE_LDFLAGS) -rpath '$(textdir)' if HAVE_WIN32 libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/dwrite.cpp @@ -34,7 +34,7 @@ libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/android.c endif if HAVE_DARWIN libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/darwin.c -libfreetype_plugin_la_LINK += -Wl,-framework,CoreFoundation -Wl,-framework,CoreText +libfreetype_plugin_la_LDFLAGS += -Wl,-framework,CoreFoundation -Wl,-framework,CoreText endif if HAVE_FRIBIDI libfreetype_plugin_la_CPPFLAGS += $(FRIBIDI_CFLAGS) -DHAVE_FRIBIDI @@ -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_LINK += $(libfreetype_plugin_la_LDFLAGS) libfreetype_plugin_la_LIBADD += $(FREETYPE_LIBS) if HAVE_FREETYPE text_LTLIBRARIES += libfreetype_plugin.la _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
