From a09f859144f31c8830cdef4b81490bf0359c5d1b Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sat, 19 Sep 2015 01:12:57 +0200
Subject: [PATCH] Build: Fix support for executable tools

Former-commit-id: c6a986ed730d5d5eac043fbf66434821aa6f6839
---
 build/scripts/common.lua | 48 ++++++++++++++++++++++++++--------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/build/scripts/common.lua b/build/scripts/common.lua
index e8bcfb6d9..3d8d853c5 100644
--- a/build/scripts/common.lua
+++ b/build/scripts/common.lua
@@ -269,47 +269,61 @@ function NazaraBuild:Execute()
 			configuration({"codeblocks or codelite or gmake", "x32"})
 				libdirs("../extlibs/lib/mingw/x86")
 				libdirs("../lib/mingw/x86")
-				targetdir("../lib/mingw/x86")
+				if (toolTable.Kind == "library") then
+					targetdir("../lib/mingw/x86")
+				end
 
 			configuration({"codeblocks or codelite or gmake", "x64"})
 				libdirs("../extlibs/lib/mingw/x64")
 				libdirs("../lib/mingw/x64")
-				targetdir("../lib/mingw/x64")
+				if (toolTable.Kind == "library") then
+					targetdir("../lib/mingw/x64")
+				end
 
 			configuration({"vs*", "x32"})
 				libdirs("../extlibs/lib/msvc/x86")
 				libdirs("../lib/msvc/x86")
-				targetdir("../lib/msvc/x86")
+				if (toolTable.Kind == "library") then
+					targetdir("../lib/msvc/x86")
+				end
 
 			configuration({"vs*", "x64"})
 				libdirs("../extlibs/lib/msvc/x64")
 				libdirs("../lib/msvc/x64")
-				targetdir("../lib/msvc/x64")
+				if (toolTable.Kind == "library") then
+					targetdir("../lib/msvc/x64")
+				end
 
 			configuration({"xcode3 or xcode4", "x32"})
 				libdirs("../extlibs/lib/xcode/x86")
 				libdirs("../lib/xcode/x86")
-				targetdir("../lib/xcode/x86")
+				if (toolTable.Kind == "library") then
+					targetdir("../lib/xcode/x86")
+				end
 
 			configuration({"xcode3 or xcode4", "x64"})
 				libdirs("../extlibs/lib/xcode/x64")
 				libdirs("../lib/xcode/x64")
-				targetdir("../lib/xcode/x64")
+				if (toolTable.Kind == "library") then
+					targetdir("../lib/xcode/x64")
+				end
 
-			configuration("*Static")
-				kind("StaticLib")
+			if (toolTable.Kind == "library") then
+				configuration("*Static")
+					kind("StaticLib")
 
-			configuration("*Dynamic")
-				kind("SharedLib")
+				configuration("*Dynamic")
+					kind("SharedLib")
+				
+				configuration("DebugStatic")
+					targetsuffix("-s-d")
 
-			configuration("DebugStatic")
-				targetsuffix("-s-d")
+				configuration("ReleaseStatic")
+					targetsuffix("-s")
 
-			configuration("ReleaseStatic")
-				targetsuffix("-s")
-
-			configuration("DebugDynamic")
-				targetsuffix("-d")
+				configuration("DebugDynamic")
+					targetsuffix("-d")
+			end
 
 			configuration({})