Merge remote-tracking branch 'refs/remotes/origin/master' into gui

build/scripts/tools/ndk.lua

@@ -26,6 +26,6 @@ TOOL.Libraries = function()
     for k,v in pairs(NazaraBuild.Modules) do
         table.insert(libraries, "Nazara" .. v.Name)
     end
-    
+
     return libraries
 end

build/scripts/tools/ndk_server.lua

@@ -46,6 +46,7 @@ TOOL.Libraries = {
 	"NazaraLua",
 	"NazaraNetwork",
 	"NazaraNoise",
-	"NazaraPhysics",
+	"NazaraPhysics2D",
+	"NazaraPhysics3D",
 	"NazaraUtility"
 }

build/scripts/tools/unittests.lua

@@ -14,7 +14,9 @@ TOOL.Includes = {
 
 TOOL.Files = {
 	"../tests/main.cpp",
+	"../tests/Engine/**.hpp",
 	"../tests/Engine/**.cpp",
+	"../tests/SDK/**.hpp",
 	"../tests/SDK/**.cpp"
 }
 

build/scripts/tools/unittests_server.lua

@@ -15,7 +15,9 @@ TOOL.Includes = {
 
 TOOL.Files = {
 	"../tests/main.cpp",
+	"../tests/Engine/**.hpp",
 	"../tests/Engine/**.cpp",
+	"../tests/SDK/**.hpp",
 	"../tests/SDK/**.cpp"
 }
 
@@ -23,6 +25,7 @@ TOOL.Files = {
 TOOL.FilesExcluded = {
 	"../tests/Engine/Audio/**",
 	"../tests/Engine/Graphics/**",
+	"../tests/Engine/Utility/**",
 	"../tests/SDK/NDK/Application.cpp",
 	"../tests/SDK/NDK/Systems/ListenerSystem.cpp",
 	"../tests/SDK/NDK/Systems/RenderSystem.cpp"