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

Build/Assimp: Fix assimp rejection 

Former-commit-id: 46fc5f3b3fd749e86afe6298cb5337ae90f02784 [formerly c271946a1cbb2924f8d79a9d7c3691c7b23c69e8] [formerly 356ec1662b9e3186da7ac6720b7affec617357e4 [formerly 159894148bb93cadef56126939147c24ff340152]]
Former-commit-id: d2e03b0875bb5a7a57817d68fe8b559fd5ba1ad5 [formerly 6ff57bf039f291f64a35cd2c0987b989adea851f]
Former-commit-id: 6673c2d846855701a289a74e01bb2b2fc61bfb25
This commit is contained in:
Lynix 2016-08-17 13:05:41 +02:00
parent 318e6368a2
commit e46267d8ae
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) 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