Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
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
Zsolt Vadász
wine
Commits
e617a9c5
Commit
e617a9c5
authored
21 years ago
by
Rein Klazes
Committed by
Alexandre Julliard
21 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Include ft2build.h before freetype/freetype.h. Libfreetype 2.1.7
requires this.
parent
15a9d287
Loading
Loading
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
configure
+3
-1
3 additions, 1 deletion
configure
configure.ac
+2
-1
2 additions, 1 deletion
configure.ac
dlls/gdi/freetype.c
+3
-0
3 additions, 0 deletions
dlls/gdi/freetype.c
dlls/wineps/truetype.c
+3
-0
3 additions, 0 deletions
dlls/wineps/truetype.c
include/config.h.in
+3
-0
3 additions, 0 deletions
include/config.h.in
with
14 additions
and
2 deletions
configure
+
3
−
1
View file @
e617a9c5
...
...
@@ -9329,7 +9329,9 @@ fi
for ac_header in freetype/freetype.h \
for ac_header in ft2build.h \
freetype/freetype.h \
freetype/ftglyph.h \
freetype/tttables.h \
freetype/ftnames.h \
...
...
This diff is collapsed.
Click to expand it.
configure.ac
+
2
−
1
View file @
e617a9c5
...
...
@@ -447,7 +447,8 @@ else
FREETYPEINCL=`$ft_devel --cflags`
ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$FREETYPEINCL $CPPFLAGS"
AC_CHECK_HEADERS(freetype/freetype.h \
AC_CHECK_HEADERS(ft2build.h \
freetype/freetype.h \
freetype/ftglyph.h \
freetype/tttables.h \
freetype/ftnames.h \
...
...
This diff is collapsed.
Click to expand it.
dlls/gdi/freetype.c
+
3
−
0
View file @
e617a9c5
...
...
@@ -45,6 +45,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
#ifdef HAVE_FREETYPE
#ifdef HAVE_FT2BUILD_H
#include
<ft2build.h>
#endif
#ifdef HAVE_FREETYPE_FREETYPE_H
#include
<freetype/freetype.h>
#endif
...
...
This diff is collapsed.
Click to expand it.
dlls/wineps/truetype.c
+
3
−
0
View file @
e617a9c5
...
...
@@ -35,6 +35,9 @@
* is anybody's guess.
*/
#ifdef HAVE_FT2BUILD_H
#include
<ft2build.h>
#endif
#ifdef HAVE_FREETYPE_FREETYPE_H
#include
<freetype/freetype.h>
#endif
...
...
This diff is collapsed.
Click to expand it.
include/config.h.in
+
3
−
0
View file @
e617a9c5
...
...
@@ -116,6 +116,9 @@
/* Define to 1 if you have the <freetype/tttables.h> header file. */
#undef HAVE_FREETYPE_TTTABLES_H
/* Define to 1 if you have the <ft2build.h> header file. */
#undef HAVE_FT2BUILD_H
/* Define to 1 if you have the `ftruncate' function. */
#undef HAVE_FTRUNCATE
...
...
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