Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
cookbook
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
redox-os
cookbook
Commits
308656c1
Commit
308656c1
authored
5 years ago
by
Fabio Di Francesco
Committed by
Jeremy Soller
5 years ago
Browse files
Options
Downloads
Patches
Plain Diff
check freetype2 fixed
parent
28324057
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
recipes/sdl_ttf/01_redox.patch
+7
-6
7 additions, 6 deletions
recipes/sdl_ttf/01_redox.patch
recipes/sdl_ttf/recipe.sh
+2
-2
2 additions, 2 deletions
recipes/sdl_ttf/recipe.sh
with
9 additions
and
8 deletions
recipes/sdl_ttf/01_redox.patch
+
7
−
6
View file @
308656c1
...
@@ -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
This diff is collapsed.
Click to expand it.
recipes/sdl_ttf/recipe.sh
+
2
−
2
View file @
308656c1
...
@@ -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
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment