mirror of
https://github.com/reactos/wine.git
synced 2024-11-24 12:20:07 +00:00
Include ft2build.h before freetype/freetype.h. Libfreetype 2.1.7
requires this.
This commit is contained in:
parent
15a9d28707
commit
e617a9c528
4
configure
vendored
4
configure
vendored
@ -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 \
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user