Skip to content
Snippets Groups Projects
Commit 308656c1 authored by Fabio Di Francesco's avatar Fabio Di Francesco Committed by Jeremy Soller
Browse files

check freetype2 fixed

parent 28324057
No related branches found
No related tags found
No related merge requests found
...@@ -45,17 +45,18 @@ diff -ruw source/configure.in source-new/configure.in ...@@ -45,17 +45,18 @@ diff -ruw source/configure.in source-new/configure.in
-if test "$FREETYPE_CONFIG" = "no" ; then -if test "$FREETYPE_CONFIG" = "no" ; then
- AC_MSG_ERROR([ - AC_MSG_ERROR([
-*** Unable to find FreeType2 library (http://www.freetype.org/) -*** Unable to find FreeType2 library (http://www.freetype.org/)
+PKG_CHECK_MODULES([FT2], [freetype2 >= 7.0.1], [], [dnl +#PKG_CHECK_MODULES([FT2], [freetype2 >= 7.0.1], [], [dnl
+ AC_CHECK_FT2(,,[AC_MSG_ERROR([dnl +# AC_CHECK_FT2(,,[AC_MSG_ERROR([dnl
+*** Unable to find FreeType2 library (http://www.freetype.org/)])] +#*** Unable to find FreeType2 library (http://www.freetype.org/)])]
+ ) +# )
]) +#])
-])
-else -else
- CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" - CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`"
- LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" - LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`"
-fi -fi
+CFLAGS="$CFLAGS $FT2_CFLAGS" +CFLAGS="$CFLAGS $FT2_CFLAGS"
+LIBS="$LIBS $FT2_LIBS" +LIBS="$LIBS $FT2_LIBS -lfreetype -lpng -lz"
dnl Check for SDL dnl Check for SDL
SDL_VERSION=1.2.4 SDL_VERSION=1.2.4
...@@ -14,10 +14,10 @@ function recipe_update { ...@@ -14,10 +14,10 @@ function recipe_update {
function recipe_build { function recipe_build {
sysroot="$(realpath ../sysroot)" sysroot="$(realpath ../sysroot)"
export CFLAGS="-I$sysroot/include" export CFLAGS="-I$sysroot/include -I$sysroot/include/freetype2"
export LDFLAGS="-L$sysroot/lib" export LDFLAGS="-L$sysroot/lib"
./autogen.sh ./autogen.sh
./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-shared --disable-sdltest ./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-shared
make -j"$(nproc)" make -j"$(nproc)"
skip=1 skip=1
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment