Commit 3e742449 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Win32: do not build GDI for text_renderers in WinRT

parent e3fab4b9
...@@ -259,7 +259,6 @@ case "${host_os}" in ...@@ -259,7 +259,6 @@ case "${host_os}" in
LDFLAGS="${LDFLAGS} -Wl,--nxcompat -Wl,--no-seh -Wl,--dynamicbase" LDFLAGS="${LDFLAGS} -Wl,--nxcompat -Wl,--no-seh -Wl,--dynamicbase"
VLC_ADD_LDFLAGS([vlc],[-mwindows]) VLC_ADD_LDFLAGS([vlc],[-mwindows])
VLC_ADD_LIBS([win32text],[-lgdi32])
AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos) AC_CHECK_PROGS(U2D, [unix2dos todos], unix2dos)
ac_default_prefix="`pwd`/_win32" ac_default_prefix="`pwd`/_win32"
DESTDIR="`pwd`/_win32/" DESTDIR="`pwd`/_win32/"
...@@ -512,6 +511,7 @@ AS_IF([test "${SYS}" = "mingw32"],[ ...@@ -512,6 +511,7 @@ AS_IF([test "${SYS}" = "mingw32"],[
vlc_winstore_app=1 vlc_winstore_app=1
VLC_ADD_LIBS([libvlccore], [-lole32 -lruntimeobject]) VLC_ADD_LIBS([libvlccore], [-lole32 -lruntimeobject])
],[ ],[
VLC_ADD_LIBS([win32text],[-lgdi32])
VLC_ADD_LIBS([libvlccore],[-lwinmm]) VLC_ADD_LIBS([libvlccore],[-lwinmm])
]) ])
]) ])
...@@ -3309,7 +3309,9 @@ if test "${enable_freetype}" != "no"; then ...@@ -3309,7 +3309,9 @@ if test "${enable_freetype}" != "no"; then
],[AC_MSG_WARN([library fontconfig not found. Styles will be disabled in freetype])]) ],[AC_MSG_WARN([library fontconfig not found. Styles will be disabled in freetype])])
fi fi
else else
AS_IF([test "$vlc_winstore_app" != "1"],[
VLC_ADD_LIBS([freetype],[-lgdi32]) VLC_ADD_LIBS([freetype],[-lgdi32])
])
fi fi
dnl fribidi support dnl fribidi support
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment