sid/NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Lynix
2016-10-28 18:46:51 +02:00
parent 01a812a5de 28a2328371
commit 1df3201b39
187 changed files with 5446 additions and 2068 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/scripts/actions/generateheaders.lua
View File

@@ -67,7 +67,7 @@ ACTION.Function = function ()
error("Failed to create header file (" .. v.Target .. "): " .. err)
end
header:write("// This file was automatically generated on " .. os.date("%d %b %Y at %X") .. "\n\n")
header:write("// This file was automatically generated\n\n")
if (v.Header) then
header:write(v.Header)
end

14
build/scripts/common.lua
View File

@@ -312,7 +312,7 @@ function NazaraBuild:Execute()
if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86")
elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/" .. makeLibDir .. "/x86")
targetdir("../plugins/lib/" .. makeLibDir .. "/x86")
end
configuration({"codeblocks or codelite or gmake", "x64"})
@@ -321,7 +321,7 @@ function NazaraBuild:Execute()
if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x64")
elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/" .. makeLibDir .. "/x64")
targetdir("../plugins/lib/" .. makeLibDir .. "/x64")
end
configuration({"vs*", "x32"})
@@ -330,7 +330,7 @@ function NazaraBuild:Execute()
if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/msvc/x86")
elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/msvc/x86")
targetdir("../plugins/lib/msvc/x86")
end
configuration({"vs*", "x64"})
@@ -339,7 +339,7 @@ function NazaraBuild:Execute()
if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/msvc/x64")
elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/msvc/x64")
targetdir("../plugins/lib/msvc/x64")
end
configuration({"xcode3 or xcode4", "x32"})
@@ -348,7 +348,7 @@ function NazaraBuild:Execute()
if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/xcode/x86")
elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/xcode/x86")
targetdir("../plugins/lib/xcode/x86")
end
configuration({"xcode3 or xcode4", "x64"})
@@ -357,7 +357,7 @@ function NazaraBuild:Execute()
if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/xcode/x64")
elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/xcode/x64")
targetdir("../plugins/lib/xcode/x64")
end
configuration("*Static")
@@ -403,7 +403,7 @@ function NazaraBuild:Execute()
for k, exampleTable in ipairs(self.OrderedExamples) do
local destPath = "../examples/bin"
project("Demo" .. exampleTable.Name)
location(_ACTION .. "/examples")

6
build/scripts/modules/physics2d.lua Normal file
View File

@@ -0,0 +1,6 @@
MODULE.Name = "Physics2D"
MODULE.Libraries = {
"NazaraCore",
"chipmunk-s"
}

2
build/scripts/modules/physics.lua → build/scripts/modules/physics3d.lua
View File

@@ -1,4 +1,4 @@
MODULE.Name = "Physics"
MODULE.Name = "Physics3D"
MODULE.Libraries = {
"NazaraCore",

2
build/scripts/tools/ndk.lua
View File

@@ -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

3
build/scripts/tools/ndk_server.lua
View File

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

2
build/scripts/tools/unittests.lua
View File

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

3
build/scripts/tools/unittests_server.lua
View File

@@ -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"