mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 01:58:19 +00:00
Remove bam
This commit is contained in:
Learath2
parent
f48a2a395b
commit
b5d919f46b
11
circle.yml
11
circle.yml
|
|
@ -6,16 +6,6 @@ dependencies:
|
|||
sudo apt-get build-dep teeworlds
|
||||
sudo apt-get install cmake libsdl2-dev xz-utils
|
||||
|
||||
- |
|
||||
if [ ! -x ~/bam/bam ]; then
|
||||
git clone https://github.com/matricks/bam ~/bam/
|
||||
cd ~/bam; ./make_unix.sh
|
||||
fi
|
||||
|
||||
cache_directories:
|
||||
- "~/bam/"
|
||||
- "~/cmake/"
|
||||
|
||||
checkout:
|
||||
post:
|
||||
- git submodule update --init
|
||||
|
|
@ -23,7 +13,6 @@ checkout:
|
|||
## Customize test commands
|
||||
compile:
|
||||
override:
|
||||
- ~/bam/bam release
|
||||
- |
|
||||
mkdir build
|
||||
cd build
|
||||
|
|
|
|||
516
configure.lua
516
configure.lua
|
|
@ -1,516 +0,0 @@
|
|||
|
||||
function loadfile_(filename, env)
|
||||
local file
|
||||
if _VERSION == "Lua 5.1" then
|
||||
file = loadfile(filename)
|
||||
if file then
|
||||
setfenv(file, env)
|
||||
end
|
||||
else
|
||||
file = loadfile(filename, nil, env)
|
||||
end
|
||||
return file
|
||||
end
|
||||
|
||||
--[[@GROUP Configuration@END]]--
|
||||
|
||||
--[[@FUNCTION
|
||||
TODO
|
||||
@END]]--
|
||||
function NewConfig(on_configured_callback)
|
||||
local config = {}
|
||||
|
||||
config.OnConfigured = function(self)
|
||||
return true
|
||||
end
|
||||
|
||||
if on_configured_callback then config.OnConfigured = on_configured_callback end
|
||||
|
||||
config.options = {}
|
||||
config.settings = NewSettings()
|
||||
|
||||
config.NewSettings = function(self)
|
||||
local s = NewSettings()
|
||||
for _,v in pairs(self.options) do
|
||||
v:Apply(s)
|
||||
end
|
||||
return s
|
||||
end
|
||||
|
||||
config.Add = function(self, o)
|
||||
table.insert(self.options, o)
|
||||
self[o.name] = o
|
||||
end
|
||||
|
||||
config.Print = function(self)
|
||||
for k,v in pairs(self.options) do
|
||||
print(v:FormatDisplay())
|
||||
end
|
||||
end
|
||||
|
||||
config.Save = function(self, filename)
|
||||
print("saved configuration to '"..filename.."'")
|
||||
local file = io.open(filename, "w")
|
||||
|
||||
-- Define a little helper function to save options
|
||||
local saver = {}
|
||||
saver.file = file
|
||||
|
||||
saver.line = function(self, str)
|
||||
self.file:write(str .. "\n")
|
||||
end
|
||||
|
||||
saver.option = function(self, option, name)
|
||||
local valuestr = "no"
|
||||
if type(option[name]) == type(0) then
|
||||
valuestr = option[name]
|
||||
elseif type(option[name]) == type(true) then
|
||||
valuestr = "false"
|
||||
if option[name] then
|
||||
valuestr = "true"
|
||||
end
|
||||
elseif type(option[name]) == type("") then
|
||||
valuestr = "'"..option[name].."'"
|
||||
else
|
||||
error("option "..name.." have a value of type ".. type(option[name]).." that can't be saved")
|
||||
end
|
||||
self.file:write(option.name.."."..name.." = ".. valuestr.."\n")
|
||||
end
|
||||
|
||||
-- Save all the options
|
||||
for k,v in pairs(self.options) do
|
||||
v:Save(saver)
|
||||
end
|
||||
file:close()
|
||||
end
|
||||
|
||||
config.Load = function(self, filename)
|
||||
local options_table = {}
|
||||
local options_func = loadfile_(filename, options_table)
|
||||
|
||||
if not options_func then
|
||||
print("auto configuration")
|
||||
self:Config(filename)
|
||||
options_func = loadfile_(filename, options_table)
|
||||
end
|
||||
|
||||
if options_func then
|
||||
-- Setup the options tables
|
||||
for k,v in pairs(self.options) do
|
||||
options_table[v.name] = {}
|
||||
end
|
||||
|
||||
-- this is to make sure that we get nice error messages when
|
||||
-- someone sets an option that isn't valid.
|
||||
local mt = {}
|
||||
mt.__index = function(t, key)
|
||||
local v = rawget(t, key)
|
||||
if v ~= nil then return v end
|
||||
error("there is no configuration option named '" .. key .. "'")
|
||||
end
|
||||
|
||||
setmetatable(options_table, mt)
|
||||
|
||||
-- Process the options
|
||||
options_func()
|
||||
|
||||
-- Copy the options
|
||||
for k,v in pairs(self.options) do
|
||||
if options_table[v.name] then
|
||||
for k2,v2 in pairs(options_table[v.name]) do
|
||||
v[k2] = v2
|
||||
end
|
||||
v.auto_detected = false
|
||||
end
|
||||
end
|
||||
else
|
||||
print("error: no '"..filename.."' found")
|
||||
print("")
|
||||
print("run 'bam config' to generate")
|
||||
print("run 'bam config help' for configuration options")
|
||||
print("")
|
||||
os.exit(1)
|
||||
end
|
||||
end
|
||||
|
||||
config.Config = function(self, filename)
|
||||
print("")
|
||||
print("configuration:")
|
||||
if _bam_targets[1] == "print" then
|
||||
self:Load(filename)
|
||||
self:Print()
|
||||
print("")
|
||||
print("notes:")
|
||||
self:OnConfigured()
|
||||
print("")
|
||||
else
|
||||
self:Autodetect()
|
||||
print("")
|
||||
print("notes:")
|
||||
if self:OnConfigured() then
|
||||
self:Save(filename)
|
||||
end
|
||||
print("")
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
config.Autodetect = function(self)
|
||||
for k,v in pairs(self.options) do
|
||||
v:Check(self.settings)
|
||||
print(v:FormatDisplay())
|
||||
self[v.name] = v
|
||||
end
|
||||
end
|
||||
|
||||
config.PrintHelp = function(self)
|
||||
print("options:")
|
||||
for k,v in pairs(self.options) do
|
||||
if v.PrintHelp then
|
||||
v:PrintHelp()
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
config.Finalize = function(self, filename)
|
||||
if _bam_targets[0] == "config" then
|
||||
if _bam_targets[1] == "help" then
|
||||
self:PrintHelp()
|
||||
os.exit(0)
|
||||
end
|
||||
|
||||
self:Config(filename)
|
||||
|
||||
os.exit(0)
|
||||
end
|
||||
|
||||
self:Load(filename)
|
||||
bam_update_globalstamp(filename)
|
||||
end
|
||||
|
||||
return config
|
||||
end
|
||||
|
||||
|
||||
-- Helper functions --------------------------------------
|
||||
function DefaultOptionDisplay(option)
|
||||
if not option.value then return "no" end
|
||||
if option.value == 1 or option.value == true then return "yes" end
|
||||
return option.value
|
||||
end
|
||||
|
||||
function IsNegativeTerm(s)
|
||||
if s == "no" then return true end
|
||||
if s == "false" then return true end
|
||||
if s == "off" then return true end
|
||||
if s == "disable" then return true end
|
||||
if s == "0" then return true end
|
||||
return false
|
||||
end
|
||||
|
||||
function IsPositiveTerm(s)
|
||||
if s == "yes" then return true end
|
||||
if s == "true" then return true end
|
||||
if s == "on" then return true end
|
||||
if s == "enable" then return true end
|
||||
if s == "1" then return true end
|
||||
return false
|
||||
end
|
||||
|
||||
function MakeOption(name, value, check, save, display, printhelp)
|
||||
local o = {}
|
||||
o.name = name
|
||||
o.value = value
|
||||
o.Check = check
|
||||
o.Save = save
|
||||
o.auto_detected = true
|
||||
o.FormatDisplay = function(self)
|
||||
local a = "SET"
|
||||
if self.auto_detected then a = "AUTO" end
|
||||
return string.format("%-5s %-20s %s", a, self.name, self:Display())
|
||||
end
|
||||
|
||||
o.Display = display
|
||||
o.PrintHelp = printhelp
|
||||
if o.Display == nil then o.Display = DefaultOptionDisplay end
|
||||
return o
|
||||
end
|
||||
|
||||
|
||||
-- Test Compile C --------------------------------------
|
||||
function OptTestCompileC(name, source, compileoptions, desc)
|
||||
local check = function(option, settings)
|
||||
option.value = false
|
||||
if ScriptArgs[option.name] then
|
||||
if IsNegativeTerm(ScriptArgs[option.name]) then
|
||||
option.value = false
|
||||
elseif IsPositiveTerm(ScriptArgs[option.name]) then
|
||||
option.value = true
|
||||
else
|
||||
error(ScriptArgs[option.name].." is not a valid value for option "..option.name)
|
||||
end
|
||||
option.auto_detected = false
|
||||
else
|
||||
if CTestCompile(settings, option.source, option.compileoptions) then
|
||||
option.value = true
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local save = function(option, output)
|
||||
output:option(option, "value")
|
||||
end
|
||||
|
||||
local printhelp = function(option)
|
||||
print("\t"..option.name.."=on|off")
|
||||
if option.desc then print("\t\t"..option.desc) end
|
||||
end
|
||||
|
||||
local o = MakeOption(name, false, check, save, nil, printhelp)
|
||||
o.desc = desc
|
||||
o.source = source
|
||||
o.compileoptions = compileoptions
|
||||
return o
|
||||
end
|
||||
|
||||
|
||||
-- OptToggle --------------------------------------
|
||||
function OptToggle(name, default_value, desc)
|
||||
local check = function(option, settings)
|
||||
if ScriptArgs[option.name] then
|
||||
if IsNegativeTerm(ScriptArgs[option.name]) then
|
||||
option.value = false
|
||||
elseif IsPositiveTerm(ScriptArgs[option.name]) then
|
||||
option.value = true
|
||||
else
|
||||
error(ScriptArgs[option.name].." is not a valid value for option "..option.name)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local save = function(option, output)
|
||||
output:option(option, "value")
|
||||
end
|
||||
|
||||
local printhelp = function(option)
|
||||
print("\t"..option.name.."=on|off")
|
||||
if option.desc then print("\t\t"..option.desc) end
|
||||
end
|
||||
|
||||
local o = MakeOption(name, default_value, check, save, nil, printhelp)
|
||||
o.desc = desc
|
||||
return o
|
||||
end
|
||||
|
||||
-- OptInteger --------------------------------------
|
||||
function OptInteger(name, default_value, desc)
|
||||
local check = function(option, settings)
|
||||
if ScriptArgs[option.name] then
|
||||
option.value = tonumber(ScriptArgs[option.name])
|
||||
end
|
||||
end
|
||||
|
||||
local save = function(option, output)
|
||||
output:option(option, "value")
|
||||
end
|
||||
|
||||
local printhelp = function(option)
|
||||
print("\t"..option.name.."=N")
|
||||
if option.desc then print("\t\t"..option.desc) end
|
||||
end
|
||||
|
||||
local o = MakeOption(name, default_value, check, save, nil, printhelp)
|
||||
o.desc = desc
|
||||
return o
|
||||
end
|
||||
|
||||
|
||||
-- OptString --------------------------------------
|
||||
function OptString(name, default_value, desc)
|
||||
local check = function(option, settings)
|
||||
if ScriptArgs[option.name] then
|
||||
option.value = ScriptArgs[option.name]
|
||||
end
|
||||
end
|
||||
|
||||
local save = function(option, output)
|
||||
output:option(option, "value")
|
||||
end
|
||||
|
||||
local printhelp = function(option)
|
||||
print("\t"..option.name.."=STRING")
|
||||
if option.desc then print("\t\t"..option.desc) end
|
||||
end
|
||||
|
||||
local o = MakeOption(name, default_value, check, save, nil, printhelp)
|
||||
o.desc = desc
|
||||
return o
|
||||
end
|
||||
|
||||
-- Find Compiler --------------------------------------
|
||||
--[[@FUNCTION
|
||||
TODO
|
||||
@END]]--
|
||||
function OptCCompiler(name, default_driver, default_c, default_cxx, desc)
|
||||
local check = function(option, settings)
|
||||
if ScriptArgs[option.name] then
|
||||
-- set compile driver
|
||||
option.driver = ScriptArgs[option.name]
|
||||
|
||||
-- set c compiler
|
||||
if ScriptArgs[option.name..".c"] then
|
||||
option.c_compiler = ScriptArgs[option.name..".c"]
|
||||
end
|
||||
|
||||
-- set c+= compiler
|
||||
if ScriptArgs[option.name..".cxx"] then
|
||||
option.cxx_compiler = ScriptArgs[option.name..".cxx"]
|
||||
end
|
||||
|
||||
option.auto_detected = false
|
||||
elseif option.driver then
|
||||
-- no need todo anything if we have a driver
|
||||
-- TODO: test if we can find the compiler
|
||||
else
|
||||
if ExecuteSilent("cl") == 0 then
|
||||
option.driver = "cl"
|
||||
elseif ExecuteSilent("g++ -v") == 0 then
|
||||
option.driver = "gcc"
|
||||
elseif ExecuteSilent("clang++ -v") == 0 then
|
||||
option.driver = "clang"
|
||||
else
|
||||
error("no c/c++ compiler found")
|
||||
end
|
||||
end
|
||||
--setup_compiler(option.value)
|
||||
end
|
||||
|
||||
local apply = function(option, settings)
|
||||
if option.driver == "cl" then
|
||||
SetDriversCL(settings)
|
||||
elseif option.driver == "gcc" then
|
||||
SetDriversGCC(settings)
|
||||
elseif option.driver == "clang" then
|
||||
SetDriversClang(settings)
|
||||
else
|
||||
error(option.driver.." is not a known c/c++ compile driver")
|
||||
end
|
||||
|
||||
if option.c_compiler then settings.cc.exe_c = option.c_compiler end
|
||||
if option.cxx_compiler then settings.cc.exe_cxx = option.cxx_compiler end
|
||||
end
|
||||
|
||||
local save = function(option, output)
|
||||
output:option(option, "driver")
|
||||
output:option(option, "c_compiler")
|
||||
output:option(option, "cxx_compiler")
|
||||
end
|
||||
|
||||
local printhelp = function(option)
|
||||
local a = ""
|
||||
if option.desc then a = "for "..option.desc end
|
||||
print("\t"..option.name.."=gcc|cl|clang")
|
||||
print("\t\twhat c/c++ compile driver to use"..a)
|
||||
print("\t"..option.name..".c=FILENAME")
|
||||
print("\t\twhat c compiler executable to use"..a)
|
||||
print("\t"..option.name..".cxx=FILENAME")
|
||||
print("\t\twhat c++ compiler executable to use"..a)
|
||||
end
|
||||
|
||||
local display = function(option)
|
||||
local s = option.driver
|
||||
if option.c_compiler then s = s .. " c="..option.c_compiler end
|
||||
if option.cxx_compiler then s = s .. " cxx="..option.cxx_compiler end
|
||||
return s
|
||||
end
|
||||
|
||||
local o = MakeOption(name, nil, check, save, display, printhelp)
|
||||
o.desc = desc
|
||||
o.driver = false
|
||||
o.c_compiler = false
|
||||
o.cxx_compiler = false
|
||||
|
||||
if default_driver then o.driver = default_driver end
|
||||
if default_c then o.c_compiler = default_c end
|
||||
if default_cxx then o.cxx_compiler = default_cxx end
|
||||
|
||||
o.Apply = apply
|
||||
return o
|
||||
end
|
||||
|
||||
-- Option Library --------------------------------------
|
||||
--[[@FUNCTION
|
||||
TODO
|
||||
@END]]--
|
||||
function OptLibrary(name, header, desc)
|
||||
local check = function(option, settings)
|
||||
option.value = false
|
||||
option.include_path = false
|
||||
|
||||
local function check_compile_include(filename, paths)
|
||||
if CTestCompile(settings, "#include <" .. filename .. ">\nint main(){return 0;}", "") then
|
||||
return ""
|
||||
end
|
||||
|
||||
for k,v in pairs(paths) do
|
||||
if CTestCompile(settings, "#include <" .. filename .. ">\nint main(){return 0;}", "-I"..v) then
|
||||
return v
|
||||
end
|
||||
end
|
||||
|
||||
return false
|
||||
end
|
||||
|
||||
if ScriptArgs[option.name] then
|
||||
if IsNegativeTerm(ScriptArgs[option.name]) then
|
||||
option.value = false
|
||||
elseif ScriptArgs[option.name] == "system" then
|
||||
option.value = true
|
||||
else
|
||||
option.value = true
|
||||
option.include_path = ScriptArgs[option.name]
|
||||
end
|
||||
option.auto_detected = false
|
||||
else
|
||||
option.include_path = check_compile_include(option.header, {})
|
||||
if option.include_path == false then
|
||||
if option.required then
|
||||
print(name.." library not found and is required")
|
||||
error("required library not found")
|
||||
end
|
||||
else
|
||||
option.value = true
|
||||
option.include_path = false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local save = function(option, output)
|
||||
output:option(option, "value")
|
||||
output:option(option, "include_path")
|
||||
end
|
||||
|
||||
local display = function(option)
|
||||
if option.value then
|
||||
if option.include_path then
|
||||
return option.include_path
|
||||
else
|
||||
return "(in system path)"
|
||||
end
|
||||
else
|
||||
return "not found"
|
||||
end
|
||||
end
|
||||
|
||||
local printhelp = function(option)
|
||||
print("\t"..option.name.."=disable|system|PATH")
|
||||
if option.desc then print("\t\t"..option.desc) end
|
||||
end
|
||||
|
||||
local o = MakeOption(name, false, check, save, display, printhelp)
|
||||
o.include_path = false
|
||||
o.header = header
|
||||
o.desc = desc
|
||||
return o
|
||||
end
|
||||
|
||||
|
|
@ -1,96 +0,0 @@
|
|||
Curl = {
|
||||
OptFind = function (name, required)
|
||||
local check = function(option, settings)
|
||||
option.value = false
|
||||
option.lib_path = nil
|
||||
|
||||
if IsNegativeTerm(ScriptArgs[name .. ".use_pkgconfig"]) then
|
||||
option.use_pkgconfig = false
|
||||
elseif IsPositiveTerm(ScriptArgs[name .. ".use_pkgconfig"]) then
|
||||
option.use_pkgconfig = true
|
||||
end
|
||||
|
||||
if family ~= "windows" and ExecuteSilent("pkg-config libcurl") == 0 then
|
||||
option.value = true
|
||||
if option.use_pkgconfig == nil then
|
||||
option.use_pkgconfig = true
|
||||
end
|
||||
end
|
||||
|
||||
if option.use_pkgconfig == nil then
|
||||
option.use_pkgconfig = false
|
||||
end
|
||||
|
||||
if platform == "win32" then
|
||||
option.value = true
|
||||
elseif platform == "win64" then
|
||||
option.value = true
|
||||
elseif platform == "macosx" and string.find(settings.config_name, "32") then
|
||||
option.value = true
|
||||
elseif platform == "macosx" and string.find(settings.config_name, "64") then
|
||||
option.value = true
|
||||
elseif platform == "linux" and arch == "ia32" then
|
||||
option.value = true
|
||||
elseif platform == "linux" and arch == "amd64" then
|
||||
option.value = true
|
||||
end
|
||||
end
|
||||
|
||||
local apply = function(option, settings)
|
||||
if option.use_pkgconfig == true then
|
||||
settings.cc.flags:Add("`pkg-config --cflags libcurl`")
|
||||
settings.link.flags:Add("`pkg-config --libs libcurl`")
|
||||
else
|
||||
settings.cc.includes:Add("ddnet-libs/curl/include")
|
||||
|
||||
if platform == "macosx" then
|
||||
settings.link.libs:Add("curl")
|
||||
settings.link.frameworks:Add("Foundation")
|
||||
settings.link.frameworks:Add("Security")
|
||||
elseif family ~= "windows" then
|
||||
settings.link.libs:Add("curl")
|
||||
settings.link.libs:Add("ssl")
|
||||
settings.link.libs:Add("crypto")
|
||||
end
|
||||
|
||||
if platform == "win32" then
|
||||
settings.link.libpath:Add("ddnet-libs/curl/windows/lib32")
|
||||
elseif platform == "win64" then
|
||||
settings.link.libpath:Add("ddnet-libs/curl/windows/lib64")
|
||||
elseif platform == "macosx" and string.find(settings.config_name, "32") then
|
||||
settings.link.libpath:Add("ddnet-libs/curl/mac/lib32")
|
||||
elseif platform == "macosx" and string.find(settings.config_name, "64") then
|
||||
settings.link.libpath:Add("ddnet-libs/curl/mac/lib64")
|
||||
elseif platform == "linux" then
|
||||
settings.link.libpath:Add("ddnet-libs/curl/linux/lib64")
|
||||
settings.link.libpath:Add("ddnet-libs/curl/linux/lib32")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local save = function(option, output)
|
||||
output:option(option, "value")
|
||||
output:option(option, "use_pkgconfig")
|
||||
end
|
||||
|
||||
local display = function(option)
|
||||
if option.value == true then
|
||||
if option.use_pkgconfig == true then return "using pkg-config" end
|
||||
return "using bundled libs"
|
||||
else
|
||||
if option.required then
|
||||
return "not found (required)"
|
||||
else
|
||||
return "not found (optional)"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local o = MakeOption(name, 0, check, save, display)
|
||||
o.Apply = apply
|
||||
o.include_path = nil
|
||||
o.lib_path = nil
|
||||
o.required = required
|
||||
return o
|
||||
end
|
||||
}
|
||||
|
|
@ -1,71 +0,0 @@
|
|||
FreeType = {
|
||||
OptFind = function (name, required)
|
||||
local check = function(option, settings)
|
||||
option.value = false
|
||||
option.use_pkgconfig = false
|
||||
option.use_winlib = 0
|
||||
option.lib_path = nil
|
||||
|
||||
if family ~= "windows" and ExecuteSilent("pkg-config freetype2") == 0 then
|
||||
option.value = true
|
||||
option.use_pkgconfig = true
|
||||
end
|
||||
|
||||
if platform == "win32" then
|
||||
option.value = true
|
||||
option.use_winlib = 32
|
||||
elseif platform == "win64" then
|
||||
option.value = true
|
||||
option.use_winlib = 64
|
||||
end
|
||||
end
|
||||
|
||||
local apply = function(option, settings)
|
||||
-- include path
|
||||
settings.cc.includes:Add("ddnet-libs/freetype/include")
|
||||
|
||||
if option.use_pkgconfig == true then
|
||||
settings.cc.flags:Add("`pkg-config freetype2 --cflags`")
|
||||
settings.link.flags:Add("`pkg-config freetype2 --libs`")
|
||||
|
||||
elseif option.use_winlib > 0 then
|
||||
if option.use_winlib == 32 then
|
||||
settings.link.libpath:Add("ddnet-libs/freetype/windows/lib32")
|
||||
else
|
||||
settings.link.libpath:Add("ddnet-libs/freetype/windows/lib64")
|
||||
end
|
||||
settings.link.libs:Add("freetype")
|
||||
else
|
||||
settings.link.libs:Add("freetype")
|
||||
end
|
||||
end
|
||||
|
||||
local save = function(option, output)
|
||||
output:option(option, "value")
|
||||
output:option(option, "use_pkgconfig")
|
||||
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_winlib == 32 then return "using supplied win32 libraries" end
|
||||
if option.use_winlib == 64 then return "using supplied win64 libraries" end
|
||||
return "using unknown method"
|
||||
else
|
||||
if option.required then
|
||||
return "not found (required)"
|
||||
else
|
||||
return "not found (optional)"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local o = MakeOption(name, 0, check, save, display)
|
||||
o.Apply = apply
|
||||
o.include_path = nil
|
||||
o.lib_path = nil
|
||||
o.required = required
|
||||
return o
|
||||
end
|
||||
}
|
||||
101
other/mysql.lua
101
other/mysql.lua
|
|
@ -1,101 +0,0 @@
|
|||
Mysql = {
|
||||
OptFind = function (name, required)
|
||||
local check = function(option, settings)
|
||||
option.value = false
|
||||
option.lib_path = nil
|
||||
|
||||
if IsNegativeTerm(ScriptArgs[name .. ".use_mysqlconfig"]) then
|
||||
option.use_mysqlconfig = false
|
||||
elseif IsPositiveTerm(ScriptArgs[name .. ".use_mysqlconfig"]) then
|
||||
option.use_mysqlconfig = true
|
||||
end
|
||||
|
||||
if platform == "linux" then
|
||||
-- Bundled libs are totally broken on lots of systems, new builds are not better, so let's just force the system ones
|
||||
if option.use_mysqlconfig == nil then
|
||||
option.use_mysqlconfig = true
|
||||
end
|
||||
end
|
||||
|
||||
if ExecuteSilent("mysql_config --version") == 0 then
|
||||
option.value = true
|
||||
if option.use_mysqlconfig == nil then
|
||||
option.use_mysqlconfig = true
|
||||
end
|
||||
end
|
||||
|
||||
if option.use_mysqlconfig == nil then
|
||||
option.use_mysqlconfig = false
|
||||
end
|
||||
|
||||
if platform == "win32" then
|
||||
option.value = true
|
||||
elseif platform == "win64" then
|
||||
option.value = true
|
||||
elseif platform == "macosx" and string.find(settings.config_name, "32") then
|
||||
option.value = true
|
||||
elseif platform == "macosx" and string.find(settings.config_name, "64") then
|
||||
option.value = true
|
||||
elseif platform == "linux" and arch == "ia32" then
|
||||
option.value = true
|
||||
elseif platform == "linux" and arch == "amd64" then
|
||||
option.value = true
|
||||
end
|
||||
end
|
||||
|
||||
local apply = function(option, settings)
|
||||
if option.use_mysqlconfig == true then
|
||||
settings.cc.flags:Add("`mysql_config --cflags`")
|
||||
settings.link.flags:Add("`mysql_config --libs`")
|
||||
settings.link.libs:Add("mysqlcppconn")
|
||||
else
|
||||
settings.cc.includes:Add("ddnet-libs/mysql/include")
|
||||
|
||||
if family ~= "windows" then
|
||||
settings.link.libs:Add("mysqlcppconn-static")
|
||||
settings.link.libs:Add("mysqlclient")
|
||||
settings.link.libs:Add("dl")
|
||||
if platform ~= "macosx" then
|
||||
settings.link.libs:Add("rt")
|
||||
end
|
||||
end
|
||||
|
||||
if platform == "macosx" and string.find(settings.config_name, "32") then
|
||||
settings.link.libpath:Add("ddnet-libs/mysql/mac/lib32")
|
||||
elseif platform == "macosx" and string.find(settings.config_name, "64") then
|
||||
settings.link.libpath:Add("ddnet-libs/mysql/mac/lib64")
|
||||
elseif platform == "linux" then
|
||||
settings.link.libpath:Add("ddnet-libs/mysql/linux/lib64")
|
||||
settings.link.libpath:Add("ddnet-libs/mysql/linux/lib32")
|
||||
elseif platform == "windows" then
|
||||
settings.link.libpath:Add("ddnet-libs/mysql/windows")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local save = function(option, output)
|
||||
output:option(option, "value")
|
||||
output:option(option, "use_mysqlconfig")
|
||||
end
|
||||
|
||||
local display = function(option)
|
||||
if option.value == true then
|
||||
if option.use_mysqlconfig == true then return "using mysql_config" end
|
||||
return "using bundled libs"
|
||||
else
|
||||
if option.required then
|
||||
return "not found (required)"
|
||||
else
|
||||
return "not found (optional)"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local o = MakeOption(name, 0, check, save, display)
|
||||
o.Apply = apply
|
||||
o.include_path = nil
|
||||
o.lib_path = nil
|
||||
o.required = required
|
||||
return o
|
||||
end
|
||||
}
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
Opusfile = {
|
||||
OptFind = function (name, required)
|
||||
local check = function(option, settings)
|
||||
option.value = false
|
||||
option.lib_path = nil
|
||||
|
||||
if IsNegativeTerm(ScriptArgs[name .. ".use_pkgconfig"]) then
|
||||
option.use_pkgconfig = false
|
||||
elseif IsPositiveTerm(ScriptArgs[name .. ".use_pkgconfig"]) then
|
||||
option.use_pkgconfig = true
|
||||
end
|
||||
|
||||
if family ~= "windows" and ExecuteSilent("pkg-config opusfile") == 0 and ExecuteSilent("pkg-config opus") == 0 and ExecuteSilent("pkg-config ogg") == 0 then
|
||||
option.value = true
|
||||
if option.use_pkgconfig == nil then
|
||||
option.use_pkgconfig = true
|
||||
end
|
||||
end
|
||||
|
||||
if option.use_pkgconfig == nil then
|
||||
option.use_pkgconfig = false
|
||||
end
|
||||
|
||||
if platform == "win32" then
|
||||
option.value = true
|
||||
elseif platform == "win64" then
|
||||
option.value = true
|
||||
elseif platform == "macosx" and string.find(settings.config_name, "32") then
|
||||
option.value = true
|
||||
elseif platform == "macosx" and string.find(settings.config_name, "64") then
|
||||
option.value = true
|
||||
elseif platform == "linux" and arch == "ia32" then
|
||||
option.value = true
|
||||
elseif platform == "linux" and arch == "amd64" then
|
||||
option.value = true
|
||||
end
|
||||
end
|
||||
|
||||
local apply = function(option, settings)
|
||||
if option.use_pkgconfig == true then
|
||||
settings.cc.flags:Add("`pkg-config --cflags opusfile`")
|
||||
settings.cc.flags:Add("`pkg-config --cflags opus`")
|
||||
settings.cc.flags:Add("`pkg-config --cflags ogg`")
|
||||
settings.link.flags:Add("`pkg-config --libs opusfile`")
|
||||
settings.link.flags:Add("`pkg-config --libs opus`")
|
||||
settings.link.flags:Add("`pkg-config --libs ogg`")
|
||||
else
|
||||
settings.cc.includes:Add("ddnet-libs/opus/include")
|
||||
settings.cc.includes:Add("ddnet-libs/opus/include/ogg")
|
||||
settings.cc.includes:Add("ddnet-libs/opus/include/opus")
|
||||
|
||||
if family ~= "windows" then
|
||||
settings.link.libs:Add("opusfile")
|
||||
settings.link.libs:Add("opus")
|
||||
settings.link.libs:Add("ogg")
|
||||
end
|
||||
|
||||
if platform == "win32" then
|
||||
client_settings.link.libpath:Add("ddnet-libs/opus/windows/lib32")
|
||||
elseif platform == "win64" then
|
||||
client_settings.link.libpath:Add("ddnet-libs/opus/windows/lib64")
|
||||
elseif platform == "macosx" and string.find(settings.config_name, "32") then
|
||||
client_settings.link.libpath:Add("ddnet-libs/opus/mac/lib32")
|
||||
elseif platform == "macosx" and string.find(settings.config_name, "64") then
|
||||
client_settings.link.libpath:Add("ddnet-libs/opus/mac/lib64")
|
||||
elseif platform == "linux" then
|
||||
client_settings.link.libpath:Add("ddnet-libs/opus/linux/lib64")
|
||||
client_settings.link.libpath:Add("ddnet-libs/opus/linux/lib32")
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local save = function(option, output)
|
||||
output:option(option, "value")
|
||||
output:option(option, "use_pkgconfig")
|
||||
end
|
||||
|
||||
local display = function(option)
|
||||
if option.value == true then
|
||||
if option.use_pkgconfig == true then return "using pkg-config" end
|
||||
return "using bundled libs"
|
||||
else
|
||||
if option.required then
|
||||
return "not found (required)"
|
||||
else
|
||||
return "not found (optional)"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local o = MakeOption(name, 0, check, save, display)
|
||||
o.Apply = apply
|
||||
o.include_path = nil
|
||||
o.lib_path = nil
|
||||
o.required = required
|
||||
return o
|
||||
end
|
||||
}
|
||||
Loading…
Reference in a new issue