MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-22 12:54:20 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'fix_sdl_ttf' into 'master'

Browse Source 
check freetype2 fixed

See merge request redox-os/cookbook!218
This commit is contained in:
Jeremy Soller 2019-08-13 13:39:29 +00:00
commit 6a4cfa7709
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
recipes/sdl_ttf/01_redox.patch
View File

@ -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

4
recipes/sdl_ttf/recipe.sh
View File

@ -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
}