vlc/vlc-3.0 | branch: master | Steve Lhomme <[email protected]> | Tue Jun 9 12:35:05 2020 +0200| [718556c44bc39993589c0a79404726073b9a0086] | committer: Steve Lhomme
freetype: fix linking for Winstore builds -luuid is needed as we use IID_IUnknown Add missing $(AM_LIBADD) messing up the order of libraries (cherry picked from commit dfa61b58d5cf74ef4c4e3eb975a007121c9c118a) Signed-off-by: Steve Lhomme <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=718556c44bc39993589c0a79404726073b9a0086 --- modules/text_renderer/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/text_renderer/Makefile.am b/modules/text_renderer/Makefile.am index 948fb9cbf0..d3cdf754aa 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) +libfreetype_plugin_la_LIBADD = $(AM_LIBADD) $(LIBM) libfreetype_plugin_la_LDFLAGS = $(FREETYPE_LDFLAGS) -rpath '$(textdir)' if HAVE_WIN32 @@ -19,7 +19,7 @@ if HAVE_WIN32_DESKTOP libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/win32.c libfreetype_plugin_la_LIBADD += -liconv -lz -lusp10 -lgdi32 -luuid else -libfreetype_plugin_la_LIBADD += -ldwrite +libfreetype_plugin_la_LIBADD += -ldwrite -luuid endif else libfreetype_plugin_la_LINK = $(LINK) _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
