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

Build: Fix example path 

Former-commit-id: 3cdf26b3497439c344bbc8b3738df6a316f6bef6 [formerly c25cd61df2ea180fa2d79585bd031027c75f2007]
Former-commit-id: 96a3ee99070e34f05b9dabb582ee878a82801c65
This commit is contained in:
Lynix 2016-06-13 21:19:12 +02:00
parent 819b46f5fc
commit d90a735372
5 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/scripts/common.lua
View File

@ -270,7 +270,7 @@ function NazaraBuild:Execute()
project(prefix .. toolTable.Name) project(prefix .. toolTable.Name)
location(_ACTION .. "/tools") location(_ACTION .. "/tools")
targetdir(toolTable.Directory) targetdir(toolTable.TargetDirectory)
if (toolTable.Kind == "plugin" or toolTable.Kind == "library") then if (toolTable.Kind == "plugin" or toolTable.Kind == "library") then
kind("SharedLib") kind("SharedLib")
@ -278,7 +278,7 @@ function NazaraBuild:Execute()
-- Copy the tool binaries to the example folder -- Copy the tool binaries to the example folder
self:MakeInstallCommands(toolTable) self:MakeInstallCommands(toolTable)
elseif (toolTable.Kind == "application") then elseif (toolTable.Kind == "application") then
debugdir(toolTable.Directory) debugdir(toolTable.TargetDirectory)
if (toolTable.EnableConsole) then if (toolTable.EnableConsole) then
kind("ConsoleApp") kind("ConsoleApp")
else else
@ -404,7 +404,7 @@ function NazaraBuild:Execute()
self:MakeInstallCommands(toolTable) self:MakeInstallCommands(toolTable)
elseif (exampleTable.Kind == "application") then elseif (exampleTable.Kind == "application") then
debugdir(exampleTable.Directory) debugdir(exampleTable.TargetDirectory)
if (exampleTable.EnableConsole) then if (exampleTable.EnableConsole) then
kind("ConsoleApp") kind("ConsoleApp")
else else
@ -769,7 +769,7 @@ 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.Directory == nil or type(toolTable.Directory) ~= "string" or string.len(toolTable.Directory) == 0) then if (toolTable.TargetDirectory == nil or type(toolTable.TargetDirectory) ~= "string" or string.len(toolTable.TargetDirectory) == 0) then
return false, "Invalid tool directory" return false, "Invalid tool directory"
end end
@ -907,7 +907,7 @@ function NazaraBuild:Process(infoTable)
end end
if (infoTable.Kind == "application") then if (infoTable.Kind == "application") then
self:AddExecutablePath(infoTable.Directory) self:AddExecutablePath(infoTable.TargetDirectory)
end end
return true return true
@ -995,8 +995,8 @@ end
function NazaraBuild:SetupExampleTable(infoTable) function NazaraBuild:SetupExampleTable(infoTable)
self:SetupInfoTable(infoTable) self:SetupInfoTable(infoTable)
infoTable.Directory = "../examples/bin"
infoTable.Kind = "application" infoTable.Kind = "application"
infoTable.TargetDirectory = "../examples/bin"
end end
function NazaraBuild:SetupExtlibTable(infoTable) function NazaraBuild:SetupExtlibTable(infoTable)

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

@ -1,7 +1,8 @@
TOOL.Name = "Assimp" TOOL.Name = "Assimp"
TOOL.Directory = "../SDK/lib" TOOL.Directory = "../plugins/Assimp"
TOOL.Kind = "Plugin" TOOL.Kind = "Plugin"
TOOL.TargetDirectory = "../SDK/lib"
TOOL.Includes = { TOOL.Includes = {
"../include", "../include",

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

@ -1,7 +1,8 @@
TOOL.Name = "SDK" TOOL.Name = "SDK"
TOOL.Directory = "../SDK/lib" TOOL.Directory = "../SDK"
TOOL.Kind = "Library" TOOL.Kind = "Library"
TOOL.TargetDirectory = "../SDK/lib"
TOOL.Defines = { TOOL.Defines = {
"NDK_BUILD" "NDK_BUILD"

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

@ -1,7 +1,8 @@
TOOL.Name = "SDKServer" TOOL.Name = "SDKServer"
TOOL.Directory = "../SDK/lib" TOOL.Directory = "../SDK"
TOOL.Kind = "Library" TOOL.Kind = "Library"
TOOL.TargetDirectory = "../SDK/lib"
TOOL.Defines = { TOOL.Defines = {
"NDK_BUILD", "NDK_BUILD",

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

@ -3,6 +3,7 @@ TOOL.Name = "UnitTests"
TOOL.Directory = "../tests" TOOL.Directory = "../tests"
TOOL.EnableConsole = true TOOL.EnableConsole = true
TOOL.Kind = "Application" TOOL.Kind = "Application"
TOOL.TargetDirectory = TOOL.Directory
TOOL.Defines = { TOOL.Defines = {
} }