Skip to content

V
vlc-2-2
Commit 1ca3578e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Remove xml2 dependency for freetype and libass on Win32

parent 4fdaf53d
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
configure.ac
View file @ 1ca3578e
...@@ -3798,7 +3798,7 @@ AS_IF( [test "${enable_libass}" = "yes"], [ ...@@ -3798,7 +3798,7 @@ AS_IF( [test "${enable_libass}" = "yes"], [
AC_CHECK_HEADERS(fontconfig/fontconfig.h, AC_CHECK_HEADERS(fontconfig/fontconfig.h,
[VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG]) [VLC_ADD_CPPFLAGS([libass],[-DHAVE_FONTCONFIG])
if test "${SYS}" = "mingw32"; then if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lz -lxml2]) VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lz])
else else
VLC_ADD_LIBS([libass],[-lfontconfig]) VLC_ADD_LIBS([libass],[-lfontconfig])
fi fi
...@@ -4239,7 +4239,7 @@ then ...@@ -4239,7 +4239,7 @@ then
VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}]) VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}]) VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
if test "${SYS}" = "mingw32"; then if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([freetype skins2],[-lxml2]) VLC_ADD_LIBS([skins2],[-lxml2])
VLC_ADD_LIBS([freetype],[-liconv]) VLC_ADD_LIBS([freetype],[-liconv])
fi fi
if test "${enable_fontconfig}" != "no" if test "${enable_fontconfig}" != "no"
......
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