Skip to content

V
vlc
Commit 640f7e70 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Temporary Hack to fix compile on Win32.

parent 0e2021e9
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
configure.ac
View file @ 640f7e70
...@@ -3779,9 +3779,12 @@ AS_IF( [test "${enable_libass}" = "yes"], [ ...@@ -3779,9 +3779,12 @@ AS_IF( [test "${enable_libass}" = "yes"], [
VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS]) VLC_ADD_CFLAGS([libass],[$LIBASS_CFLAGS])
VLC_ADD_PLUGIN([libass]) VLC_ADD_PLUGIN([libass])
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])]) VLC_ADD_LIBS([libass],[-lfontconfig])])
if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([libass],[-lfontconfig -lfreetype -liconv -lxml2])
fi
],[ ],[
AC_MSG_WARN([LIBASS library not found]) AC_MSG_WARN([LIBASS library not found])
]) ])
...@@ -4158,7 +4161,10 @@ then ...@@ -4158,7 +4161,10 @@ then
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([freetype skins2],[-lxml2])
fi fi
if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([freetype],[-liconv])
fi
AC_CHECK_HEADERS(fontconfig/fontconfig.h, AC_CHECK_HEADERS(fontconfig/fontconfig.h,
[VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG]) [VLC_ADD_CPPFLAGS([freetype],[-DHAVE_FONTCONFIG])
VLC_ADD_LIBS([freetype],[-lfontconfig])]) VLC_ADD_LIBS([freetype],[-lfontconfig])])
......
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