~ fix post rebase & dirty fix avoid deleting shaders before linking them

This commit is contained in:
REMqb 2022-11-30 20:19:08 +01:00 committed by Jérôme Leclercq
parent f172330aaf
commit 7cb90782de
3 changed files with 9 additions and 5 deletions

View File

@ -1,3 +1,7 @@
if not has_config("assimp") then
return
end
target("Showcase")
set_group("Examples")
set_kind("binary")

View File

@ -102,7 +102,7 @@ namespace Nz::GL
inline void Shader::DestroyHelper(OpenGLDevice& /*device*/, const Context& context, GLuint objectId)
{
context.glDeleteShader(objectId);
// context.glDeleteShader(objectId);
}
}

View File

@ -200,7 +200,7 @@ if not is_plat("wasm") then
add_requires("freetype", { configs = { bzip2 = true, png = true, woff2 = true, zlib = true, debug = is_mode("debug") } })
add_requires("libvorbis", { configs = { with_vorbisenc = false } })
add_requires("openal-soft", { configs = { shared = true }})
add_requires("newtondynamics", { debug = is_plat("windows") and is_mode("debug") }) -- Newton doesn't like compiling in Debug on Linux
add_requires("newtondynamics3", { debug = is_plat("windows") and is_mode("debug") }) -- Newton doesn't like compiling in Debug on Linux
end
add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo")
@ -337,9 +337,9 @@ function ModuleTargetConfig(name, module)
end
end
function ModuleTarget(name, module)
target("Nazara" .. name)
set_kind("shared")
for name, module in pairs(modules) do
target("Nazara" .. name, function ()
set_kind("$(kind)")
set_group("Modules")
add_rpathdirs("$ORIGIN")