Commit 6a4cfa77 authored by Jeremy Soller's avatar Jeremy Soller

Merge branch 'fix_sdl_ttf' into 'master'

check freetype2 fixed

See merge request !218
parents 28324057 308656c1
......@@ -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
......@@ -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
}
......
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