diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-01 18:51:59 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-01-01 18:51:59 +0000 |
| commit | c1d166be18a2cabbe0df2a1c6a704f04a97137cd (patch) | |
| tree | ea7b8208a0b4b09061133b348ec406897422f18f | |
| parent | 92cd6dc3e916ae4275ff05d2b238fc778cfbfc6b (diff) | |
| download | mpv-c1d166be18a2cabbe0df2a1c6a704f04a97137cd.tar.bz2 mpv-c1d166be18a2cabbe0df2a1c6a704f04a97137cd.tar.xz | |
Fix compilation if FreeType is not available, in particular do not try to build
libass and use the internal ass.h as a stub for structs needed for EOSD.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30166 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libass/ass_mp.h | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -6154,6 +6154,7 @@ echocheck "SSA/ASS support" # libass depends on FreeType if test "$_freetype" = no ; then _ass=no + ass_internal=no _res_comment="FreeType support needed" fi @@ -6169,6 +6170,7 @@ EOF _ass=no cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes if test "$_ass" = no ; then + ass_internal=no _res_comment="FreeType >= 2.1.8 needed" elif test "$ass_internal" = no ; then _res_comment="external" diff --git a/libass/ass_mp.h b/libass/ass_mp.h index 74fc869c2e..2b96ddeea1 100644 --- a/libass/ass_mp.h +++ b/libass/ass_mp.h @@ -24,7 +24,7 @@ #define LIBASS_MP_H #include "subreader.h" -#ifdef CONFIG_ASS_INTERNAL +#if defined(CONFIG_ASS_INTERNAL) || !defined(CONFIG_ASS) #include "ass.h" #else #include <ass/ass.h> |