enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

copy over ft1 support too... :) 

SVN revision: 5586
This commit is contained in:
Carsten Haitzler 2001-10-28 21:54:19 +00:00
parent 36b47822cc
commit 467a45e0eb
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/evas/configure.in
View File

@ -134,11 +134,13 @@ AC_MSG_ERROR([Fatal Error: no FreeType detected.])
],
$LIBS_TTF -lm)
AC_CHECK_HEADERS(freetype.h freetype/freetype.h, [ break ], )
AC_CHECK_HEADERS(freetype.h freetype/freetype.h freetype1/freetype/freetype.h, [ break ], )
AC_CHECK_HEADER(freetype.h, [ ftype=yes ], [ ftype=no ])
AC_CHECK_HEADER(freetype/freetype.h, [ ftype_ftype=yes ], [ ftype_ftype=no ])
AC_CHECK_HEADER(freetype1/freetype/freetype.h, [ ftype1_ftype=yes ], [ ftype1_ftype=no ])
if test x$ftype = xno; then
if test x$ftype_ftype = xno; then
if test x$ftype1_ftype = xno; then
echo ""
echo "ERROR: freetype.h not found in freetype.h or freetype/freetype.h include"
echo "paths. (ie /usr/include, /usr/local/include etc.). You need the freetype"
@ -157,6 +159,7 @@ echo ""
AC_MSG_ERROR([Fatal Error: no FreeType header files detected.])
fi
fi
fi
ttf_includes="$CPPFLAGS"
ttf_libs="$LIBS_TTF -lm -lttf"

4
legacy/evas/src/evas_gl_routines.h
View File

@ -23,11 +23,15 @@ typedef int GLuint;
#include <X11/Xutil.h>
#include <X11/Xmu/StdCmap.h>
#ifdef HAVE_FREETYPE1_FREETYPE_FREETYPE_H
#include <freetype1/freetype/freetype.h>
#else
#ifdef HAVE_FREETYPE_FREETYPE_H
#include <freetype/freetype.h>
#else
#include <freetype.h>
#endif
#endif
#include "Evas_private.h"
#include "Evas.h"

6
legacy/evas/src/evas_x11_routines.h
View File

@ -12,11 +12,15 @@
#include <X11/Xatom.h>
#include <X11/Xutil.h>
#ifdef HAVE_FREETYPE_FREETYPE_H
#ifdef HAVE_FREETYPE1_FREETYPE_FREETYPE_H
#include <freetype1/freetype/freetype.h>
#else
# ifdef HAVE_FREETYPE_FREETYPE_H
#include <freetype/freetype.h>
#else
#include <freetype.h>
#endif
#endif
#include "Evas_private.h"
#include "Evas.h"