ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Include ft2build.h before freetype/freetype.h. Libfreetype 2.1.7 

requires this.
This commit is contained in:
Rein Klazes 2003-11-19 02:18:13 +00:00 committed by Alexandre Julliard
parent 15a9d28707
commit e617a9c528
5 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -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/ftglyph.h \
freetype/tttables.h \ freetype/tttables.h \
freetype/ftnames.h \ freetype/ftnames.h \

3
configure.ac
View File

@ -447,7 +447,8 @@ else
FREETYPEINCL=`$ft_devel --cflags` FREETYPEINCL=`$ft_devel --cflags`
ac_save_CPPFLAGS="$CPPFLAGS" ac_save_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$FREETYPEINCL $CPPFLAGS" CPPFLAGS="$FREETYPEINCL $CPPFLAGS"
AC_CHECK_HEADERS(freetype/freetype.h \ AC_CHECK_HEADERS(ft2build.h \
freetype/freetype.h \
freetype/ftglyph.h \ freetype/ftglyph.h \
freetype/tttables.h \ freetype/tttables.h \
freetype/ftnames.h \ freetype/ftnames.h \

3
dlls/gdi/freetype.c
View File

@ -45,6 +45,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(font);
#ifdef HAVE_FREETYPE #ifdef HAVE_FREETYPE
#ifdef HAVE_FT2BUILD_H
#include <ft2build.h>
#endif
#ifdef HAVE_FREETYPE_FREETYPE_H #ifdef HAVE_FREETYPE_FREETYPE_H
#include <freetype/freetype.h> #include <freetype/freetype.h>
#endif #endif

3
dlls/wineps/truetype.c
View File

@ -35,6 +35,9 @@
* is anybody's guess. * is anybody's guess.
*/ */
#ifdef HAVE_FT2BUILD_H
#include <ft2build.h>
#endif
#ifdef HAVE_FREETYPE_FREETYPE_H #ifdef HAVE_FREETYPE_FREETYPE_H
#include <freetype/freetype.h> #include <freetype/freetype.h>
#endif #endif

3
include/config.h.in
View File

@ -116,6 +116,9 @@
/* Define to 1 if you have the <freetype/tttables.h> header file. */ /* Define to 1 if you have the <freetype/tttables.h> header file. */
#undef HAVE_FREETYPE_TTTABLES_H #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. */ /* Define to 1 if you have the `ftruncate' function. */
#undef HAVE_FTRUNCATE #undef HAVE_FTRUNCATE