diff --git a/plugins/Assimp/xmake.lua b/plugins/Assimp/xmake.lua index 6858d4361..acbd55293 100644 --- a/plugins/Assimp/xmake.lua +++ b/plugins/Assimp/xmake.lua @@ -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") diff --git a/xmake.lua b/xmake.lua index 3a1aeaa74..18a369280 100644 --- a/xmake.lua +++ b/xmake.lua @@ -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 })