diff --git a/recipes/sdl_ttf/01_redox.patch b/recipes/sdl_ttf/01_redox.patch index 1ed96943be6fe47d9cc28c39b85781efb10cd628..d2b7ecd79ffbf1646af4b111d030683692102471 100644 --- a/recipes/sdl_ttf/01_redox.patch +++ b/recipes/sdl_ttf/01_redox.patch @@ -45,17 +45,18 @@ diff -ruw source/configure.in source-new/configure.in -if test "$FREETYPE_CONFIG" = "no" ; then - AC_MSG_ERROR([ -*** Unable to find FreeType2 library (http://www.freetype.org/) -+PKG_CHECK_MODULES([FT2], [freetype2 >= 7.0.1], [], [dnl -+ AC_CHECK_FT2(,,[AC_MSG_ERROR([dnl -+*** Unable to find FreeType2 library (http://www.freetype.org/)])] -+ ) - ]) ++#PKG_CHECK_MODULES([FT2], [freetype2 >= 7.0.1], [], [dnl ++# AC_CHECK_FT2(,,[AC_MSG_ERROR([dnl ++#*** Unable to find FreeType2 library (http://www.freetype.org/)])] ++# ) ++#]) +-]) -else - CFLAGS="$CFLAGS `$FREETYPE_CONFIG $freetypeconf_args --cflags`" - LIBS="$LIBS `$FREETYPE_CONFIG $freetypeconf_args --libs`" -fi +CFLAGS="$CFLAGS $FT2_CFLAGS" -+LIBS="$LIBS $FT2_LIBS" ++LIBS="$LIBS $FT2_LIBS -lfreetype -lpng -lz" dnl Check for SDL SDL_VERSION=1.2.4 diff --git a/recipes/sdl_ttf/recipe.sh b/recipes/sdl_ttf/recipe.sh index 44dfbedfbadd10b313e961efe3c96efb2772c86d..07cee556a8e4c540db65cb591bc08863be33d1e0 100644 --- a/recipes/sdl_ttf/recipe.sh +++ b/recipes/sdl_ttf/recipe.sh @@ -14,10 +14,10 @@ function recipe_update { function recipe_build { sysroot="$(realpath ../sysroot)" - export CFLAGS="-I$sysroot/include" + export CFLAGS="-I$sysroot/include -I$sysroot/include/freetype2" export LDFLAGS="-L$sysroot/lib" ./autogen.sh - ./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-shared --disable-sdltest + ./configure --prefix=/ --build=${BUILD} --host=${HOST} --disable-shared make -j"$(nproc)" skip=1 }