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

Merge branch 'master' into vulkan

Browse Source 
Former-commit-id: f91a339c32e2ab8f0ef3fd2cfc5c038ceccdc401
This commit is contained in:
Lynix
2016-05-17 20:25:51 +02:00
parent f35c518256 d2a6ead9f3
commit d2c372247f
20 changed files with 417 additions and 580 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
build/scripts/common.lua
View File

@@ -188,6 +188,11 @@ function NazaraBuild:Execute()
libdirs("../lib/" .. makeLibDir .. "/x64")
targetdir("../lib/" .. makeLibDir .. "/x64")
-- Copy the module binaries to the example folder
if (os.is("windows")) then
self:MakeCopyAfterBuild(moduleTable)
end
configuration({"vs*", "x32"})
libdirs("../extlibs/lib/msvc/x86")
libdirs("../lib/msvc/x86")
@@ -300,10 +305,7 @@ function NazaraBuild:Execute()
-- 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
self:MakeCopyAfterBuild(toolTable)
end
configuration({"vs*", "x32"})
@@ -844,6 +846,34 @@ function NazaraBuild:Process(infoTable)
end
end
function NazaraBuild:MakeCopyAfterBuild(infoTable)
if (os.is("windows")) then
configuration({})
postbuildcommands({[[xcopy "%{path.translate(cfg.linktarget.relpath):sub(1, -5) .. ".dll"}" "..\..\..\examples\bin\" /E /Y]]})
for k,v in pairs(table.join(infoTable.Libraries, infoTable.DynLib)) do
local paths = {}
table.insert(paths, {"x32", "../extlibs/lib/common/x86/" .. v .. ".dll"})
table.insert(paths, {"x32", "../extlibs/lib/common/x86/lib" .. v .. ".dll"})
table.insert(paths, {"x64", "../extlibs/lib/common/x64/" .. v .. ".dll"})
table.insert(paths, {"x64", "../extlibs/lib/common/x64/lib" .. v .. ".dll"})
for k,v in pairs(paths) do
local config = v[1]
local path = v[2]
if (os.isfile(path)) then
if (infoTable.Kind == "plugin") then
path = "../../" .. path
end
configuration(config)
postbuildcommands({[[xcopy "%{path.translate(cfg.linktarget.relpath:sub(1, -#cfg.linktarget.name - 1) .. "../../]] .. path .. [[")}" "..\..\..\examples\bin\" /E /Y]]})
end
end
end
end
end
function NazaraBuild:SetupInfoTable(infoTable)
infoTable.ConfigurationLibraries = {}
infoTable.ConfigurationLibraries.DebugStatic = {}
@@ -851,7 +881,7 @@ function NazaraBuild:SetupInfoTable(infoTable)
infoTable.ConfigurationLibraries.DebugDynamic = {}
infoTable.ConfigurationLibraries.ReleaseDynamic = {}
local infos = {"Defines", "Files", "FilesExcluded", "Flags", "Includes", "Libraries"}
local infos = {"Defines", "DynLib", "Files", "FilesExcluded", "Flags", "Includes", "Libraries"}
for k,v in ipairs(infos) do
infoTable[v] = {}
infoTable["Os" .. v] = {}

4
build/scripts/modules/audio.lua
View File

@@ -14,6 +14,10 @@ MODULE.OsFiles.Windows = {
"../src/Nazara/Audio/Win32/**.cpp"
}
MODULE.OsDynLib.Windows = {
"soft_oal"
}
MODULE.OsFiles.Posix = {
"../src/Nazara/Audio/Posix/**.hpp",
"../src/Nazara/Audio/Posix/**.cpp"

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

@@ -1,5 +1,7 @@
TOOL.Name = "SDK"
TOOL.CopyTargetToExampleDir = true
TOOL.Directory = "../SDK/lib"
TOOL.Kind = "Library"

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

@@ -1,5 +1,7 @@
TOOL.Name = "SDKServer"
TOOL.CopyTargetToExampleDir = true
TOOL.Directory = "../SDK/lib"
TOOL.Kind = "Library"