From 174ba365444d6e7a69ab6c26a9766e7b53515367 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sun, 19 Jan 2014 13:00:41 +0400 Subject: [PATCH] ft: correctly include FreeType We shouldn't include bundled freetype libs if we found freetype-config Signed-off-by: Igor Gnatenko --- other/freetype/freetype.lua | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/other/freetype/freetype.lua b/other/freetype/freetype.lua index aa5af22dd..c80350319 100644 --- a/other/freetype/freetype.lua +++ b/other/freetype/freetype.lua @@ -23,14 +23,11 @@ FreeType = { end local apply = function(option, settings) - -- include path - settings.cc.includes:Add(FreeType.basepath .. "/include") - if option.use_ftconfig == true then settings.cc.flags:Add("`freetype-config --cflags`") settings.link.flags:Add("`freetype-config --libs`") - elseif option.use_winlib > 0 then + settings.cc.includes:Add(FreeType.basepath .. "/include") if option.use_winlib == 32 then settings.link.libpath:Add(FreeType.basepath .. "/lib32") else