vlc | branch: master | Hugo Beauzée-Luyssen <[email protected]> | Fri Dec 30 14:11:08 2016 +0100| [9e393d0a452e150f739bbd5bfdd95426d6c4665f] | committer: Hugo Beauzée-Luyssen
freetype: Makefile: Group win32 parts together > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9e393d0a452e150f739bbd5bfdd95426d6c4665f --- modules/text_renderer/Makefile.am | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/text_renderer/Makefile.am b/modules/text_renderer/Makefile.am index 1e4686f..fef32da 100644 --- a/modules/text_renderer/Makefile.am +++ b/modules/text_renderer/Makefile.am @@ -12,16 +12,15 @@ libfreetype_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) $(FREETYPE_CFLAGS) libfreetype_plugin_la_LIBADD = $(LIBM) $(FREETYPE_LIBS) libfreetype_plugin_la_LDFLAGS = $(AM_LDFLAGS) $(FREETYPE_LDFLAGS) -rpath '$(textdir)' +if HAVE_WIN32 +libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/dwrite.cpp if HAVE_WIN32_DESKTOP -libfreetype_plugin_la_SOURCES += \ - text_renderer/freetype/fonts/win32.c text_renderer/freetype/fonts/dwrite.cpp +libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/win32.c libfreetype_plugin_la_LIBADD += -liconv -lz -lgdi32 -lusp10 -luuid -endif -if HAVE_WINSTORE -libfreetype_plugin_la_SOURCES += \ - text_renderer/freetype/fonts/dwrite.cpp +else libfreetype_plugin_la_LIBADD += -ldwrite endif +endif if HAVE_FONTCONFIG libfreetype_plugin_la_SOURCES += text_renderer/freetype/fonts/fontconfig.c libfreetype_plugin_la_CPPFLAGS += -DHAVE_FONTCONFIG _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
