Merge branch 'master' into vulkan

2018-01-16 21:15:58 +01:00
parent 1e190caa2c 78c2e06b58
commit 1c3654148d
375 changed files with 133309 additions and 549 deletions
--- a/build/scripts/tools/assimp.lua
+++ b/build/scripts/tools/assimp.lua
@@ -4,7 +4,7 @@ TOOL.Directory = "../plugins/Assimp"
 TOOL.Kind = "Plugin"

 TOOL.Includes = {
-	"../extlibs/include",
+	"../thirdparty/include",
 	"../include",
    "../plugins/Assimp"
 }
--- a/build/scripts/tools/ndk.lua
+++ b/build/scripts/tools/ndk.lua
@@ -27,5 +27,8 @@ TOOL.Libraries = function()
        table.insert(libraries, "Nazara" .. v.Name)
    end

+	-- Keep libraries in the same order to prevent useless premake regeneration
+	table.sort(libraries)
+
    return libraries
 end
--- a/build/scripts/tools/unittests.lua
+++ b/build/scripts/tools/unittests.lua
@@ -1,5 +1,6 @@
 TOOL.Name = "UnitTests"

+TOOL.Category = "Test"
 TOOL.Directory = "../tests"
 TOOL.EnableConsole = true
 TOOL.Kind = "Application"
--- a/build/scripts/tools/unittests_server.lua
+++ b/build/scripts/tools/unittests_server.lua
@@ -1,5 +1,6 @@
 TOOL.Name = "UnitTestsServer"

+TOOL.Category = "Test"
 TOOL.Directory = "../tests"
 TOOL.EnableConsole = true
 TOOL.Kind = "Application"