From a05f9222ee40332c8c42d650c84f6acab3cd5cc6 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Mon, 17 Oct 2016 14:14:17 +0200
Subject: [PATCH] Build: Output plugins binaries to plugins/lib instead of
 plugin/NAME/lib

---
 .gitignore               |  3 +++
 build/scripts/common.lua | 14 +++++++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2e9057d9c..0801d2577 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,9 @@ build/config.lua
 # Nazara libraries
 lib/*
 
+# Nazara plugin libraries
+plugins/lib/*
+
 # Nazara package
 package/*
 
diff --git a/build/scripts/common.lua b/build/scripts/common.lua
index 30272acfd..423ebad0d 100644
--- a/build/scripts/common.lua
+++ b/build/scripts/common.lua
@@ -312,7 +312,7 @@ function NazaraBuild:Execute()
 				if (toolTable.Kind == "library") then
 					targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x86")
 				elseif (toolTable.Kind == "plugin") then
-					targetdir("../plugins/" .. toolTable.Name .. "/lib/" .. makeLibDir .. "/x86")
+					targetdir("../plugins/lib/" .. makeLibDir .. "/x86")
 				end
 
 			configuration({"codeblocks or codelite or gmake", "x64"})
@@ -321,7 +321,7 @@ function NazaraBuild:Execute()
 				if (toolTable.Kind == "library") then
 					targetdir(toolTable.TargetDirectory .. "/" .. makeLibDir .. "/x64")
 				elseif (toolTable.Kind == "plugin") then
-					targetdir("../plugins/" .. toolTable.Name .. "/lib/" .. makeLibDir .. "/x64")
+					targetdir("../plugins/lib/" .. makeLibDir .. "/x64")
 				end
 
 			configuration({"vs*", "x32"})
@@ -330,7 +330,7 @@ function NazaraBuild:Execute()
 				if (toolTable.Kind == "library") then
 					targetdir(toolTable.TargetDirectory .. "/msvc/x86")
 				elseif (toolTable.Kind == "plugin") then
-					targetdir("../plugins/" .. toolTable.Name .. "/lib/msvc/x86")
+					targetdir("../plugins/lib/msvc/x86")
 				end
 
 			configuration({"vs*", "x64"})
@@ -339,7 +339,7 @@ function NazaraBuild:Execute()
 				if (toolTable.Kind == "library") then
 					targetdir(toolTable.TargetDirectory .. "/msvc/x64")
 				elseif (toolTable.Kind == "plugin") then
-					targetdir("../plugins/" .. toolTable.Name .. "/lib/msvc/x64")
+					targetdir("../plugins/lib/msvc/x64")
 				end
 
 			configuration({"xcode3 or xcode4", "x32"})
@@ -348,7 +348,7 @@ function NazaraBuild:Execute()
 				if (toolTable.Kind == "library") then
 					targetdir(toolTable.TargetDirectory .. "/xcode/x86")
 				elseif (toolTable.Kind == "plugin") then
-					targetdir("../plugins/" .. toolTable.Name .. "/lib/xcode/x86")
+					targetdir("../plugins/lib/xcode/x86")
 				end
 
 			configuration({"xcode3 or xcode4", "x64"})
@@ -357,7 +357,7 @@ function NazaraBuild:Execute()
 				if (toolTable.Kind == "library") then
 					targetdir(toolTable.TargetDirectory .. "/xcode/x64")
 				elseif (toolTable.Kind == "plugin") then
-					targetdir("../plugins/" .. toolTable.Name .. "/lib/xcode/x64")
+					targetdir("../plugins/lib/xcode/x64")
 				end
 
 			configuration("*Static")
@@ -403,7 +403,7 @@ function NazaraBuild:Execute()
 
 		for k, exampleTable in ipairs(self.OrderedExamples) do
 			local destPath = "../examples/bin"
-				
+
 			project("Demo" .. exampleTable.Name)
 
 			location(_ACTION .. "/examples")