sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build: Forcefully disable asan for package not supporting it

Browse Source 
wayland, libcurl and ffmpeg
This commit is contained in:
SirLynix
2023-10-28 11:55:24 +02:00
parent f707c3b739
commit 9f88d8a7e8
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/FFmpeg/xmake.lua
View File

@@ -1,7 +1,7 @@
option("ffmpeg", { description = "Build FFmpeg plugin", default = false, category = "Plugins" }) option("ffmpeg", { description = "Build FFmpeg plugin", default = false, category = "Plugins" })
if has_config("ffmpeg") then if has_config("ffmpeg") then
add_requires("ffmpeg", { configs = { shared = true } }) add_requires("ffmpeg", { configs = { asan = false, shared = true } })
target("PluginFFmpeg") target("PluginFFmpeg")
set_group("Plugins") set_group("Plugins")

6
xmake.lua
View File

@@ -300,9 +300,9 @@ if has_config("network") then
-- emscripten fetch API is used for WebService on wasm -- emscripten fetch API is used for WebService on wasm
if not is_plat("wasm") then if not is_plat("wasm") then
if has_config("link_curl") then if has_config("link_curl") then
add_requires("libcurl") add_requires("libcurl", { configs = { asan = false } })
else else
add_requires("libcurl", { configs = { shared = true }}) add_requires("libcurl", { configs = { asan = false, shared = true }})
end end
end end
end end
@@ -360,7 +360,7 @@ if is_plat("linux", "android") then
end end
if is_plat("linux") then if is_plat("linux") then
add_requires("libxext", "wayland") add_requires("libxext", "wayland", { configs = { asan = false } })
end end
----------------------- Global config ----------------------- ----------------------- Global config -----------------------