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

Merge pull request #1519 from Henningstone/pr-ft2-pkgconf

Browse source 
Try using pkg-config for freetype2 as well
This commit is contained in:
oy 2018-10-14 08:14:25 +02:00 committed by GitHub
parent b3981fb74c 9e5435d920
commit 87b17e2a78
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
other/freetype/freetype.lua
View file

@ -4,11 +4,15 @@ FreeType = {
OptFind = function (name, required)
local check = function(option, settings)
option.value = false
option.use_pkgconfig = false
option.use_ftconfig = false
option.use_winlib = 0
option.lib_path = nil
if ExecuteSilent("freetype-config") > 0 and ExecuteSilent("freetype-config --cflags") == 0 then
if ExecuteSilent("pkg-config freetype2") == 0 then
option.value = true
option.use_pkgconfig = true
elseif ExecuteSilent("freetype-config") > 0 and ExecuteSilent("freetype-config --cflags") == 0 then
option.value = true
option.use_ftconfig = true
end
@ -23,7 +27,10 @@ FreeType = {
end
local apply = function(option, settings)
if option.use_ftconfig == true then
if option.use_pkgconfig == true then
settings.cc.flags:Add("`pkg-config --cflags freetype2`")
settings.link.flags:Add("`pkg-config --libs freetype2`")
elseif 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
@ -39,12 +46,14 @@ FreeType = {
local save = function(option, output)
output:option(option, "value")
output:option(option, "use_pkgconfig")
output:option(option, "use_ftconfig")
output:option(option, "use_winlib")
end
local display = function(option)
if option.value == true then
if option.use_pkgconfig == true then return "using pkg-config" end
if option.use_ftconfig == true then return "using freetype-config" end
if option.use_winlib == 32 then return "using supplied win32 libraries" end
if option.use_winlib == 64 then return "using supplied win64 libraries" end