~ fix post rebase & dirty fix avoid deleting shaders before linking them
This commit is contained in:
parent
f172330aaf
commit
7cb90782de
|
|
@ -1,3 +1,7 @@
|
||||||
|
if not has_config("assimp") then
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
target("Showcase")
|
target("Showcase")
|
||||||
set_group("Examples")
|
set_group("Examples")
|
||||||
set_kind("binary")
|
set_kind("binary")
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ namespace Nz::GL
|
||||||
|
|
||||||
inline void Shader::DestroyHelper(OpenGLDevice& /*device*/, const Context& context, GLuint objectId)
|
inline void Shader::DestroyHelper(OpenGLDevice& /*device*/, const Context& context, GLuint objectId)
|
||||||
{
|
{
|
||||||
context.glDeleteShader(objectId);
|
// context.glDeleteShader(objectId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -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("freetype", { configs = { bzip2 = true, png = true, woff2 = true, zlib = true, debug = is_mode("debug") } })
|
||||||
add_requires("libvorbis", { configs = { with_vorbisenc = false } })
|
add_requires("libvorbis", { configs = { with_vorbisenc = false } })
|
||||||
add_requires("openal-soft", { configs = { shared = true }})
|
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
|
end
|
||||||
|
|
||||||
add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo")
|
add_repositories("nazara-engine-repo https://github.com/NazaraEngine/xmake-repo")
|
||||||
|
|
@ -337,9 +337,9 @@ function ModuleTargetConfig(name, module)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function ModuleTarget(name, module)
|
for name, module in pairs(modules) do
|
||||||
target("Nazara" .. name)
|
target("Nazara" .. name, function ()
|
||||||
set_kind("shared")
|
set_kind("$(kind)")
|
||||||
set_group("Modules")
|
set_group("Modules")
|
||||||
|
|
||||||
add_rpathdirs("$ORIGIN")
|
add_rpathdirs("$ORIGIN")
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue