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

Change libpath of freetype on windows

Browse source 
* Make libpath of freetype libraries consistent with sdl2 libpath (/lib/arch)
* Remove trailing whitespaces in freetype.lua
This commit is contained in:
msiglreith 2015-06-16 14:12:55 +02:00 committed by oy
parent afb0a69264
commit 26ab35dab1
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
other/freetype/freetype.lua
View file

@ -1,18 +1,18 @@
FreeType = {
basepath = PathDir(ModuleFilename()),
OptFind = function (name, required)
OptFind = function (name, required)
local check = function(option, settings)
option.value = 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
option.value = true
option.use_ftconfig = true
end
if platform == "win32" then
option.value = true
option.use_winlib = 32
@ -21,7 +21,7 @@ FreeType = {
option.use_winlib = 64
end
end
local apply = function(option, settings)
if option.use_ftconfig == true then
settings.cc.flags:Add("`freetype-config --cflags`")
@ -29,20 +29,20 @@ FreeType = {
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")
settings.link.libpath:Add(FreeType.basepath .. "/lib/x86")
else
settings.link.libpath:Add(FreeType.basepath .. "/lib64")
settings.link.libpath:Add(FreeType.basepath .. "/lib/x64")
end
settings.link.libs:Add("freetype")
end
end
local save = function(option, output)
output:option(option, "value")
output:option(option, "use_ftconfig")
output:option(option, "use_winlib")
end
local display = function(option)
if option.value == true then
if option.use_ftconfig == true then return "using freetype-config" end
@ -57,7 +57,7 @@ FreeType = {
end
end
end
local o = MakeOption(name, 0, check, save, display)
o.Apply = apply
o.include_path = nil