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 

Former-commit-id: 2e493255187c5475d9b95b9e6587882147ba73d6 [formerly a927d09a1b19979816b780e45aef97586b35803d] [formerly 210b99c352db0c551479502d20b23c4aa82243ec [formerly 7bc73ba32423ca914d7223357a718f374050830d]]
Former-commit-id: 162363b9c34c4ef911b40fd804f7b57f06e7b4cc [formerly 796fb4d4f5b557206930658c5b5c1931f5c1e701]
Former-commit-id: 75cb3cf72f63c56632d7754bddea9c999b8fe454
This commit is contained in:
Lynix 2016-08-17 13:12:14 +02:00
parent 24a9993c10 db21a3204a
commit d7a10031d7
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build/scripts/common.lua
View File

@ -278,6 +278,7 @@ function NazaraBuild:Execute()
self:MakeInstallCommands(toolTable) self:MakeInstallCommands(toolTable)
elseif (toolTable.Kind == "application") then elseif (toolTable.Kind == "application") then
debugdir(toolTable.TargetDirectory) debugdir(toolTable.TargetDirectory)
targetdir(toolTable.TargetDirectory)
if (toolTable.EnableConsole) then if (toolTable.EnableConsole) then
kind("ConsoleApp") kind("ConsoleApp")
else else
@ -295,8 +296,6 @@ function NazaraBuild:Execute()
libdirs("../lib") libdirs("../lib")
libdirs("../extlibs/lib/common") libdirs("../extlibs/lib/common")
targetdir(toolTable.TargetDirectory)
configuration("x32") configuration("x32")
libdirs(toolTable.LibraryPaths.x86) libdirs(toolTable.LibraryPaths.x86)
@ -306,7 +305,7 @@ function NazaraBuild:Execute()
configuration({"codeblocks or codelite or gmake", "x32"}) configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../extlibs/lib/" .. makeLibDir .. "/x86") libdirs("../extlibs/lib/" .. makeLibDir .. "/x86")
libdirs(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86") libdirs("../lib/" .. makeLibDir .. "/x86")
if (toolTable.Kind == "library") then if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86") targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86")
elseif (toolTable.Kind == "plugin") then elseif (toolTable.Kind == "plugin") then
@ -315,6 +314,7 @@ function NazaraBuild:Execute()
configuration({"codeblocks or codelite or gmake", "x64"}) configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../extlibs/lib/" .. makeLibDir .. "/x64") libdirs("../extlibs/lib/" .. makeLibDir .. "/x64")
libdirs("../lib/" .. makeLibDir .. "/x86")
if (toolTable.Kind == "library") then if (toolTable.Kind == "library") then
targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x64") targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x64")
elseif (toolTable.Kind == "plugin") then elseif (toolTable.Kind == "plugin") then
@ -576,10 +576,10 @@ function NazaraBuild:Initialize()
local succeed, err = self:RegisterTool(TOOL) local succeed, err = self:RegisterTool(TOOL)
if (not succeed) then if (not succeed) then
print("Unable to register tool: " .. err) print("Unable to register tool " .. tostring(TOOL.Name) .. ": " .. err)
end end
else else
print("Unable to load tool file: " .. err) print("Unable to load tool file " .. v .. ": " .. err)
end end
end end
TOOL = nil TOOL = nil
@ -990,10 +990,6 @@ function NazaraBuild:RegisterTool(toolTable)
return false, "This tool name is already in use" return false, "This tool name is already in use"
end end
if (toolTable.TargetDirectory == nil or type(toolTable.TargetDirectory) ~= "string" or string.len(toolTable.TargetDirectory) == 0) then
return false, "Invalid tool directory"
end
if (toolTable.Kind == nil or type(toolTable.Kind) ~= "string" or string.len(toolTable.Kind) == 0) then if (toolTable.Kind == nil or type(toolTable.Kind) ~= "string" or string.len(toolTable.Kind) == 0) then
return false, "Invalid tool type" return false, "Invalid tool type"
end end
@ -1005,6 +1001,10 @@ function NazaraBuild:RegisterTool(toolTable)
return false, "Invalid tool type" return false, "Invalid tool type"
end end
if (lowerCaseKind ~= "plugin" and (toolTable.TargetDirectory == nil or type(toolTable.TargetDirectory) ~= "string" or string.len(toolTable.TargetDirectory) == 0)) then
return false, "Invalid tool directory"
end
toolTable.Type = "Tool" toolTable.Type = "Tool"
self.Tools[lowerCaseName] = toolTable self.Tools[lowerCaseName] = toolTable
return true return true