[vlc-devel] [PATCH] freetype: fix linking for Winstore builds

Steve Lhomme robux4 at ycbcr.xyz
Wed Jun 10 10:09:59 CEST 2020


On 2020-06-09 17:28, Rémi Denis-Courmont wrote:
> Le tiistaina 9. kesäkuuta 2020, 14.11.06 EEST Steve Lhomme a écrit :
>> -luuid is needed as we use IID_IUnknown
>>
>> Add missing $(AM_LIBADD) messing up the order of libraries
>> ---
>>   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 948fb9cbf080..d3cdf754aaaa 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)
> 
> Not clear why store and desktop are different but patch ok.

The fonts/win32.c is using many API's not allowed in Winstore builds.

As for dwrite that's because in Winstore mode we link to the DLL 
directly and in "desktop" mode we load the DLL manually.


More information about the vlc-devel mailing list