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

Build: Fix TargetDirectory not being taken into account 

Former-commit-id: 34c501043fa1c585f0773b662725ff58673ab589 [formerly 44f9516100c88cb4170123b4ddab01f449aeb5ed] [formerly 3e07d12226333e80ee24280ada1b57e31f15d4cd [formerly 86f8902caefeb9a7112fe1ff9c9617173f6a67bb]]
Former-commit-id: 5cdbb7ea7193e3a8caa74154e86941df4f5571b1 [formerly 4719afc062ad3de9317863b505c7facd76a1b8d8]
Former-commit-id: 94fba8a695ddcc5f70de6e1607fd4782f468d851
This commit is contained in:
Lynix 2016-08-17 12:59:12 +02:00
parent 2c213b38ec
commit d9423b873b
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
build/scripts/common.lua
View File

@ -270,7 +270,6 @@ function NazaraBuild:Execute()
project(prefix .. toolTable.Name)
location(_ACTION .. "/tools")
targetdir(toolTable.TargetDirectory)
if (toolTable.Kind == "plugin" or toolTable.Kind == "library") then
kind("SharedLib")
@ -296,6 +295,8 @@ function NazaraBuild:Execute()
libdirs("../lib")
libdirs("../extlibs/lib/common")
targetdir(toolTable.TargetDirectory)
configuration("x32")
libdirs(toolTable.LibraryPaths.x86)
@ -305,18 +306,17 @@ function NazaraBuild:Execute()
configuration({"codeblocks or codelite or gmake", "x32"})
libdirs("../extlibs/lib/" .. makeLibDir .. "/x86")
libdirs("../lib/" .. makeLibDir .. "/x86")
libdirs(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86")
if (toolTable.Kind == "library") then
targetdir("../lib/" .. makeLibDir .. "/x86")
targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86")
elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/" .. makeLibDir .. "/x86")
end
configuration({"codeblocks or codelite or gmake", "x64"})
libdirs("../extlibs/lib/" .. makeLibDir .. "/x64")
libdirs("../lib/" .. makeLibDir .. "/x64")
if (toolTable.Kind == "library") then
targetdir("../lib/" .. makeLibDir .. "/x64")
targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x64")
elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/" .. makeLibDir .. "/x64")
end
@ -325,7 +325,7 @@ function NazaraBuild:Execute()
libdirs("../extlibs/lib/msvc/x86")
libdirs("../lib/msvc/x86")
if (toolTable.Kind == "library") then
targetdir("../lib/msvc/x86")
targetdir(toolTable.TargetDirectory .. "/msvc/x86")
elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/msvc/x86")
end
@ -334,7 +334,7 @@ function NazaraBuild:Execute()
libdirs("../extlibs/lib/msvc/x64")
libdirs("../lib/msvc/x64")
if (toolTable.Kind == "library") then
targetdir("../lib/msvc/x64")
targetdir(toolTable.TargetDirectory .. "/msvc/x64")
elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/msvc/x64")
end
@ -343,7 +343,7 @@ function NazaraBuild:Execute()
libdirs("../extlibs/lib/xcode/x86")
libdirs("../lib/xcode/x86")
if (toolTable.Kind == "library") then
targetdir("../lib/xcode/x86")
targetdir(toolTable.TargetDirectory .. "/xcode/x86")
elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/xcode/x86")
end
@ -352,7 +352,7 @@ function NazaraBuild:Execute()
libdirs("../extlibs/lib/xcode/x64")
libdirs("../lib/xcode/x64")
if (toolTable.Kind == "library") then
targetdir("../lib/xcode/x64")
targetdir(toolTable.TargetDirectory .. "/xcode/x64")
elseif (toolTable.Kind == "plugin") then
targetdir("../plugins/" .. toolTable.Name .. "/lib/xcode/x64")
end

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

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

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

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

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

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