diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2013-03-26 08:57:05 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-04-01 12:03:55 +0200 |
| commit | 6845a4fb0147117e8517d66f18792ca7acdbe06e (patch) | |
| tree | 68e35417b79989a7af8a4ea8c0d282b84dbe0a6e /src/3rdparty/freetype/builds/unix/freetype-config.in | |
| parent | 0fcadcca3d0842354de07ffaa8c622e607aab22c (diff) | |
Update bundled FreeType sources to 2.3.12
Most important changes:
* SFNT cmap 13 table format support;
* fixed glitches when rasterizing stretched TTF (xsize!=ysize);
* various fixes in Type1, CFF, and PCF drivers
Change-Id: Ib9e2210ffbd0daa2fdbf518ea87f4be502de6b48
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'src/3rdparty/freetype/builds/unix/freetype-config.in')
| -rw-r--r-- | src/3rdparty/freetype/builds/unix/freetype-config.in | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/3rdparty/freetype/builds/unix/freetype-config.in b/src/3rdparty/freetype/builds/unix/freetype-config.in index 9606d318bd..0a7a767d6e 100644 --- a/src/3rdparty/freetype/builds/unix/freetype-config.in +++ b/src/3rdparty/freetype/builds/unix/freetype-config.in @@ -101,11 +101,11 @@ if test "$local_prefix" = "yes" ; then fi if test "$echo_prefix" = "yes" ; then - echo $prefix + echo ${SYSROOT}$prefix fi if test "$echo_exec_prefix" = "yes" ; then - echo $exec_prefix + echo ${SYSROOT}$exec_prefix fi if test "$exec_prefix_set" = "yes" ; then @@ -118,22 +118,22 @@ else fi if test "$echo_ft_version" = "yes" ; then - major=`grep define $includedir/freetype2/freetype/freetype.h \ + major=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \ | grep FREETYPE_MAJOR \ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` - minor=`grep define $includedir/freetype2/freetype/freetype.h \ + minor=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \ | grep FREETYPE_MINOR \ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` - patch=`grep define $includedir/freetype2/freetype/freetype.h \ + patch=`grep define ${SYSROOT}$includedir/freetype2/freetype/freetype.h \ | grep FREETYPE_PATCH \ | sed 's/.*[ ]\([0-9][0-9]*\).*/\1/'` echo $major.$minor.$patch fi if test "$echo_cflags" = "yes" ; then - cflags="-I$includedir/freetype2" - if test "$includedir" != "/usr/include" ; then - echo $cflags -I$includedir + cflags="-I${SYSROOT}$includedir/freetype2" + if test "${SYSROOT}$includedir" != "/usr/include" ; then + echo $cflags -I${SYSROOT}$includedir else echo $cflags fi @@ -145,8 +145,8 @@ if test "$echo_libs" = "yes" ; then eval "rpath=\"$hardcode_libdir_flag_spec\"" fi libs="-lfreetype @LIBZ@ @FT2_EXTRA_LIBS@" - if test "$libdir" != "/usr/lib" && test "$libdir" != "/usr/lib64"; then - echo -L$libdir $rpath $libs + if test "${SYSROOT}$libdir" != "/usr/lib" && test "${SYSROOT}$libdir" != "/usr/lib64"; then + echo -L${SYSROOT}$libdir $libs else echo $libs fi @@ -154,7 +154,7 @@ fi if test "$echo_libtool" = "yes" ; then convlib="libfreetype.la" - echo $libdir/$convlib + echo ${SYSROOT}$libdir/$convlib fi # EOF |