From c6a82d687174ff6113ab77aafa7ab9367ada2a92 Mon Sep 17 00:00:00 2001 From: omy Date: Wed, 16 Apr 2014 13:54:28 +0400 Subject: [PATCH] 0024630: Support building with Freetype 2.5.1+ Added support of new versions of Freetype library: include path was extended: /include/freetype2 --- src/WOKsite/wok_deps.tcl | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/src/WOKsite/wok_deps.tcl b/src/WOKsite/wok_deps.tcl index a3b7c0a..0003fc5 100644 --- a/src/WOKsite/wok_deps.tcl +++ b/src/WOKsite/wok_deps.tcl @@ -304,11 +304,23 @@ proc wokdep:SearchFreeType {theErrInc theErrLib32 theErrLib64 theErrBin32 theErr set isFound "true" set aFtPath [wokdep:SearchHeader "freetype/freetype.h"] set aFtBuildPath [wokdep:SearchHeader "ft2build.h"] + + # New version of headers + if { "$aFtPath" == "" } { + set aFtPath [wokdep:SearchHeader "freetype2/freetype.h"] + } + + if { "$aFtBuildPath" == "" } { + set aFtBuildPath [wokdep:SearchHeader "freetype2/ft2build.h"] + } + if { "$aFtPath" == "" || "$aFtBuildPath" == "" } { # TODO - use `freetype-config --cflags` instead set aSysFreeType "/usr/include/freetype2" if { [file exists "$aSysFreeType/freetype/freetype.h"] } { lappend ::CSF_OPT_INC "$aSysFreeType" + } elseif { [file exists "$aSysFreeType/freetype2/freetype.h"] } { + lappend ::CSF_OPT_INC "$aSysFreeType/freetype2" } else { set aSysFreeType "/usr/X11/include/freetype2" if { [file exists "$aSysFreeType/freetype/freetype.h"] } { @@ -316,8 +328,12 @@ proc wokdep:SearchFreeType {theErrInc theErrLib32 theErrLib64 theErrBin32 theErr lappend ::CSF_OPT_INC "$aSysFreeType" } else { set aPath [wokdep:Preferred [glob -nocomplain -directory "$::PRODUCTS_PATH" -type d *{freetype}*] "$::VCVER" "$::ARCH" ] - if { "$aPath" != "" && [file exists "$aPath/include/freetype/freetype.h"] && [file exists "$aPath/include/ft2build.h"] } { - lappend ::CSF_OPT_INC "$aPath/include" + if {"$aPath" != "" && ([file exists "$aPath/include/freetype/freetype.h"] || [file exists "$aPath/include/freetype2/freetype.h"])} { + if {[file exists "$aPath/include/ft2build.h"]} { + lappend ::CSF_OPT_INC "$aPath/include" + } elseif {[file exists "$aPath/include/freetype2/ft2build.h"]} { + lappend ::CSF_OPT_INC "$aPath/include/freetype2" + } } else { lappend anErrInc "Error: 'freetype.h' not found (FreeType2)" set isFound "false" -- 2.39.5