Build: Fix TargetDirectory not being taken into account

Former-commit-id: a022d3dc07743529a3c9523149f264add20ebe44 [formerly 81e2340920ab4565129751cfd9ad74d7c1f71c18] [formerly 1bcaa5dcf97ff705b2e26bf78cbc76830eb3fae0 [formerly cab3c7a3e8af6b72e720a7dfa858d6a03e8bd7cf]]
Former-commit-id: cee0ce949787d64407b7b982b2d7287ef0c96481 [formerly eea525a514121da003f8b88c225192b361c65568]
Former-commit-id: df9ea49de0575753e5e8c800e306701a6ca9f899

build/scripts/common.lua

@@ -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

build/scripts/tools/assimp.lua

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

build/scripts/tools/ndk.lua

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

build/scripts/tools/ndk_server.lua

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