Skip to content

V
vlc-1.1
Commit 897ae9ca authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Try (again!) to fix win32 libass compilation

parent e657d0dc
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 4 deletions
configure.ac
View file @ 897ae9ca
...@@ -3772,8 +3772,7 @@ dnl ...@@ -3772,8 +3772,7 @@ dnl
AC_ARG_ENABLE(libass, AC_ARG_ENABLE(libass,
[ --enable-libass Subtitle support using libass (default disabled)]) [ --enable-libass Subtitle support using libass (default disabled)])
AS_IF( [test "${enable_libass}" = "yes"], [ AS_IF( [test "${enable_libass}" = "yes"], [
PKG_CHECK_MODULES(LIBASS, PKG_CHECK_MODULES(LIBASS, libass >= 0.9.5,
libass >= 0.9.5,
[ [
VLC_ADD_LDFLAGS([libass],[$LIBASS_LIBS]) VLC_ADD_LDFLAGS([libass],[$LIBASS_LIBS])
VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS]) VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
...@@ -3781,10 +3780,12 @@ AS_IF( [test "${enable_libass}" = "yes"], [ ...@@ -3781,10 +3780,12 @@ 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])
VLC_ADD_LIBS([libass],[-lfontconfig])])
if test "${SYS}" = "mingw32"; then if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lxml2]) VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lxml2])
else
VLC_ADD_LIBS([libass],[-lfontconfig])
fi fi
])
],[ ],[
AC_MSG_WARN([LIBASS library not found]) AC_MSG_WARN([LIBASS library not found])
]) ])
......
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