Merge branch 'master' into vulkan

Former-commit-id: 5e11ffb71a4deddeaa44a1b1e93aeea97525bd9c
This commit is contained in:
Lynix
2016-05-14 13:58:06 +02:00
107 changed files with 3433 additions and 1558 deletions

View File

@@ -298,6 +298,14 @@ function NazaraBuild:Execute()
targetdir("../plugins/" .. toolTable.Name .. "/lib/" .. makeLibDir .. "/x64")
end
-- Copy the module binaries to the example folder
if (toolTable.CopyTargetToExampleDir) then
if (os.is("windows")) then
configuration({})
postbuildcommands({[[xcopy "%{path.translate(cfg.linktarget.relpath):sub(1, -5) .. ".dll"}" "..\..\..\examples\bin\" /E /Y]]})
end
end
configuration({"vs*", "x32"})
libdirs("../extlibs/lib/msvc/x86")
libdirs("../lib/msvc/x86")

View File

@@ -3,6 +3,8 @@ TOOL.Name = "Assimp"
TOOL.Directory = "../SDK/lib"
TOOL.Kind = "Plugin"
TOOL.CopyTargetToExampleDir = true
TOOL.Includes = {
"../include",
"../plugins/Assimp"