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/configure | |
| 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/configure')
| -rwxr-xr-x | src/3rdparty/freetype/configure | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/src/3rdparty/freetype/configure b/src/3rdparty/freetype/configure index b59d35d07e..2efa269679 100755 --- a/src/3rdparty/freetype/configure +++ b/src/3rdparty/freetype/configure @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright 2002, 2003, 2004, 2005, 2006, 2008 by +# Copyright 2002, 2003, 2004, 2005, 2006, 2008, 2009 by # David Turner, Robert Wilhelm, and Werner Lemberg. # # This file is part of the FreeType project, and may only be used, modified, @@ -67,12 +67,25 @@ ft2_dir=`(dirname "$0") 2>/dev/null || abs_curr_dir=`pwd` abs_ft2_dir=`cd "$ft2_dir" && pwd` +# `--srcdir=' option can override abs_ft2_dir + +if test $# -gt 0; then + for x in "$@"; do + case x"$x" in + x--srcdir=*) + abs_ft2_dir=`echo $x | sed 's/^--srcdir=//'` ;; + esac + done +fi + # build a dummy Makefile if we are not building in the source tree if test "$abs_curr_dir" != "$abs_ft2_dir"; then mkdir reference - echo "Copying \`modules.cfg'" - cp $abs_ft2_dir/modules.cfg $abs_curr_dir + if test ! -r $abs_curr_dir/modules.cfg; then + echo "Copying \`modules.cfg'" + cp $abs_ft2_dir/modules.cfg $abs_curr_dir + fi echo "Generating \`Makefile'" echo "TOP_DIR := $abs_ft2_dir" > Makefile echo "OBJ_DIR := $abs_curr_dir" >> Makefile @@ -96,7 +109,10 @@ CFG= case $# in 0) ;; *) for x in "$@"; do - CFG="$CFG '$x'" + case x"$x" in + x--srcdir=* ) CFG="$CFG '$x'/builds/unix" ;; + *) CFG="$CFG '$x'" ;; + esac done ;; esac CFG=$CFG $GNUMAKE setup unix |