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

(6666th commit 😈 ) Allow Assimp >=5.2.5 and xmake fix 

5.2.4 had some bugs (see https://github.com/assimp/assimp/issues/4557)
Also fixes embed_plugins and link_openal options
This commit is contained in:
Lynix 2023-02-05 11:32:23 +01:00
parent 63429cba62
commit a8b003224d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/Assimp/xmake.lua
View File

@ -1,7 +1,7 @@
option("assimp", { description = "Build Assimp plugin", default = true })
if has_config("assimp") then
add_requires("assimp v5.2.3")
add_requires("assimp >=5.2.5")
target("PluginAssimp")
set_group("Plugins")

4
xmake.lua
View File

@ -191,8 +191,8 @@ includes("xmake/**.lua")
option("compile_shaders", { description = "Compile nzsl shaders into an includable binary version", default = true })
option("embed_rendererbackends", { description = "Embed renderer backend code into NazaraRenderer instead of loading them dynamically", default = false })
option("embed_resources", { description = "Turn builtin resources into includable headers", default = true })
option("embed_plugins", { description = "Embed enabled plugins code as static libraries", default = is_plat("wasm") })
option("link_openal", { description = "Link OpenAL in the executable instead of dynamically loading it", default = is_plat("wasm") })
option("embed_plugins", { description = "Embed enabled plugins code as static libraries", default = is_plat("wasm") or false })
option("link_openal", { description = "Link OpenAL in the executable instead of dynamically loading it", default = is_plat("wasm") or false })
option("override_runtime", { description = "Override vs runtime to MD in release and MDd in debug", default = true })
option("usepch", { description = "Use precompiled headers to speedup compilation", default = false })
option("unitybuild", { description = "Build the engine using unity build", default = false })