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

Build/Assimp: Fix assimp rejection 

Former-commit-id: 0565c70bb35215b3bcda0368d709730055161827 [formerly 5272f3ad85542d2f45e0314bf399d12a6d656fff] [formerly 39a37805566ce1dea9f8a0bccdfebe989ba50142 [formerly 827c3b178b687946ef7559735d4325b4d4f7bd42]]
Former-commit-id: 0796fc3248fb234361eb6bef14a76faa0a824056 [formerly b96bbddabdf7708aa8522632b0e860590a0d7db4]
Former-commit-id: 7377a548aa94c75f22d8d3c420df8fb7e33b0d2b
This commit is contained in:
Lynix 2016-08-17 13:05:41 +02:00
parent bd048291ad
commit 62ebc3e8cf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/scripts/common.lua
View File

@ -576,10 +576,10 @@ function NazaraBuild:Initialize()
local succeed, err = self:RegisterTool(TOOL)
if (not succeed) then
print("Unable to register tool: " .. err)
print("Unable to register tool " .. tostring(TOOL.Name) .. ": " .. err)
end
else
print("Unable to load tool file: " .. err)
print("Unable to load tool file " .. v .. ": " .. err)
end
end
TOOL = nil
@ -990,10 +990,6 @@ function NazaraBuild:RegisterTool(toolTable)
return false, "This tool name is already in use"
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
return false, "Invalid tool type"
end
@ -1005,6 +1001,10 @@ function NazaraBuild:RegisterTool(toolTable)
return false, "Invalid tool type"
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"
self.Tools[lowerCaseName] = toolTable
return true