Commit 8e587b3f authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Change freetype libs order to fix win32 compile

parent 92f02a13
...@@ -3700,10 +3700,10 @@ then ...@@ -3700,10 +3700,10 @@ then
VLC_ADD_PLUGIN([freetype]) VLC_ADD_PLUGIN([freetype])
have_freetype=yes have_freetype=yes
VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}]) VLC_ADD_CPPFLAGS([freetype skins2],[${FREETYPE_CFLAGS}])
VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
if test "${SYS}" = "mingw32"; then if test "${SYS}" = "mingw32"; then
VLC_ADD_LIBS([freetype],[-liconv -lz]) VLC_ADD_LIBS([freetype],[-liconv -lz])
fi fi
VLC_ADD_LIBS([freetype skins2],[${FREETYPE_LIBS}])
if test "${enable_fontconfig}" != "no" if test "${enable_fontconfig}" != "no"
then then
AC_CHECK_HEADERS(fontconfig/fontconfig.h, AC_CHECK_HEADERS(fontconfig/fontconfig.h,
...@@ -3712,14 +3712,6 @@ then ...@@ -3712,14 +3712,6 @@ then
AC_CHECK_HEADERS(Carbon/Carbon.h, AC_CHECK_HEADERS(Carbon/Carbon.h,
[VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])]) [VLC_ADD_LDFLAGS([freetype],[-Wl,-framework,Carbon])])
fi fi
],[
have_freetype=no
AS_IF([ test "${enable_freetype}" = "yes"],[
AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
])
])
])
dnl fribidi support dnl fribidi support
if test "${enable_fribidi}" != "no" if test "${enable_fribidi}" != "no"
...@@ -3729,6 +3721,16 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice ...@@ -3729,6 +3721,16 @@ from http://www.freetype.org/, or configure with --disable-freetype. Have a nice
VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}]) VLC_ADD_LIBS([freetype skins2], [${FRIBIDI_LIBS}])
]) ])
fi fi
],[
have_freetype=no
AS_IF([ test "${enable_freetype}" = "yes"],[
AC_MSG_ERROR([I couldn't find the freetype package. You can download libfreetype2
from http://www.freetype.org/, or configure with --disable-freetype. Have a nice day.
])
])
])
fi fi
dnl dnl
......
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