diff options
| author | ruki <[email protected]> | 2024-08-31 00:43:21 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-08-31 00:43:21 +0800 |
| commit | b7ef860d94d16822e75d56b6f48ad3416913e095 (patch) | |
| tree | 336b979400ec1282be0c06c61829ce201fe5800e /xmake/modules/package/tools/meson.lua | |
| parent | 8317c6570c5abcd0e054741f58770b7eb57ec744 (diff) | |
rename api
Diffstat (limited to 'xmake/modules/package/tools/meson.lua')
| -rw-r--r-- | xmake/modules/package/tools/meson.lua | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index 641a57eb2..21ab6faf1 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -291,9 +291,9 @@ function _get_configs_file(package, opt) -- add runtimes flags for _, runtime in ipairs(package:runtimes()) do if not runtime:startswith("M") then - table.join2(cxxflags, toolchain_utils.map_compflags(package, "cxx", "runtime", {runtime})) - table.join2(ldflags, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "runtime", {runtime})) - table.join2(shflags, toolchain_utils.map_linkflags(package, "shared", {"cxx"}, "runtime", {runtime})) + table.join2(cxxflags, toolchain_utils.map_compflags_for_package(package, "cxx", "runtime", {runtime})) + table.join2(ldflags, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "runtime", {runtime})) + table.join2(shflags, toolchain_utils.map_linkflags_for_package(package, "shared", {"cxx"}, "runtime", {runtime})) end end if #cflags > 0 then @@ -412,13 +412,13 @@ function _get_cflags_from_packagedeps(package, opt) local result = {} if values then if values.defines then - table.join2(result, toolchain_utils.map_compflags(package, "cxx", "define", values.defines)) + table.join2(result, toolchain_utils.map_compflags_for_package(package, "cxx", "define", values.defines)) end if values.includedirs then - table.join2(result, toolchain_utils.map_compflags(package, "cxx", "includedir", values.includedirs)) + table.join2(result, toolchain_utils.map_compflags_for_package(package, "cxx", "includedir", values.includedirs)) end if values.sysincludedirs then - table.join2(result, toolchain_utils.map_compflags(package, "cxx", "sysincludedir", values.sysincludedirs)) + table.join2(result, toolchain_utils.map_compflags_for_package(package, "cxx", "sysincludedir", values.sysincludedirs)) end end return _translate_flags(package, result) @@ -443,16 +443,16 @@ function _get_ldflags_from_packagedeps(package, opt) local result = {} if values then if values.linkdirs then - table.join2(result, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "linkdir", values.linkdirs)) + table.join2(result, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "linkdir", values.linkdirs)) end if values.links then - table.join2(result, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "link", values.links)) + table.join2(result, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "link", values.links)) end if values.syslinks then - table.join2(result, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "syslink", values.syslinks)) + table.join2(result, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "syslink", values.syslinks)) end if values.frameworks then - table.join2(result, toolchain_utils.map_linkflags(package, "binary", {"cxx"}, "framework", values.frameworks)) + table.join2(result, toolchain_utils.map_linkflags_for_package(package, "binary", {"cxx"}, "framework", values.frameworks)) end end return _translate_flags(package, result) |
