edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 14:38:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

ft: correctly include FreeType

Browse source 
We shouldn't include bundled freetype libs if we found freetype-config

Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
This commit is contained in:
Igor Gnatenko 2014-01-19 13:00:41 +04:00
parent 22fe75245c
commit 174ba36544
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
other/freetype/freetype.lua
View file

@ -23,14 +23,11 @@ FreeType = {
end end
local apply = function(option, settings) local apply = function(option, settings)
-- include path
settings.cc.includes:Add(FreeType.basepath .. "/include")
if option.use_ftconfig == true then if option.use_ftconfig == true then
settings.cc.flags:Add("`freetype-config --cflags`") settings.cc.flags:Add("`freetype-config --cflags`")
settings.link.flags:Add("`freetype-config --libs`") settings.link.flags:Add("`freetype-config --libs`")
elseif option.use_winlib > 0 then elseif option.use_winlib > 0 then
settings.cc.includes:Add(FreeType.basepath .. "/include")
if option.use_winlib == 32 then if option.use_winlib == 32 then
settings.link.libpath:Add(FreeType.basepath .. "/lib32") settings.link.libpath:Add(FreeType.basepath .. "/lib32")
else else