mirror of
https://gitea.wildfiregames.com/0ad/0ad.git
synced 2026-11-08 10:09:16 +00:00
Require fmt-5.3
Drop support for pre pkg-config fmt. Signed-off-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
This commit is contained in:
1 file changed
+2
-24
@@ -308,26 +308,9 @@ extern_lib_defs = {
|
|||||||
compile_settings = function()
|
compile_settings = function()
|
||||||
if os.istarget("windows") then
|
if os.istarget("windows") then
|
||||||
add_default_include_paths("fmt")
|
add_default_include_paths("fmt")
|
||||||
elseif os.istarget("macosx") then
|
else
|
||||||
pkgconfig.add_includes("fmt")
|
pkgconfig.add_includes("fmt")
|
||||||
end
|
end
|
||||||
|
|
||||||
-- With Linux & BSD, we assume that fmt is installed in a standard location.
|
|
||||||
--
|
|
||||||
-- It would be nice to not assume, and to instead use pkg-config: however that
|
|
||||||
-- requires fmt 5.3.0 or greater.
|
|
||||||
--
|
|
||||||
-- Unfortunately (at the time of writing) only 92 out of 114 (~80.7%) of distros
|
|
||||||
-- that provide a fmt package meet this, according to
|
|
||||||
-- https://repology.org/badge/vertical-allrepos/fmt.svg?minversion=5.3
|
|
||||||
--
|
|
||||||
-- Whilst that might seem like a healthy majority, this does not include the 2018
|
|
||||||
-- Long Term Support and 2019.10 releases of Ubuntu - not only popular and widely
|
|
||||||
-- used as-is, but which are also used as a base for other popular distros (e.g.
|
|
||||||
-- Mint).
|
|
||||||
--
|
|
||||||
-- When fmt 5.3 (or better) becomes more widely used, then we can safely use the
|
|
||||||
-- same line as we currently use for osx
|
|
||||||
end,
|
end,
|
||||||
link_settings = function()
|
link_settings = function()
|
||||||
if os.istarget("windows") then
|
if os.istarget("windows") then
|
||||||
@@ -337,13 +320,8 @@ extern_lib_defs = {
|
|||||||
dbg_suffix = "d",
|
dbg_suffix = "d",
|
||||||
no_delayload = 1,
|
no_delayload = 1,
|
||||||
})
|
})
|
||||||
elseif os.istarget("macosx") then
|
|
||||||
-- See comment above as to why this is not also used on Linux or BSD.
|
|
||||||
pkgconfig.add_links("fmt")
|
|
||||||
else
|
else
|
||||||
add_default_links({
|
pkgconfig.add_links("fmt")
|
||||||
unix_names = { "fmt" },
|
|
||||||
})
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
},
|
},
|
||||||
|
|||||||
Reference in new issue
Block a user