From 58f8ffac35dd23c3c19dde45eb2089fda18195d5 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Mon, 15 Jun 2015 13:41:50 +0200
Subject: [PATCH] Move libraries to specific directories (depending on the
 compiler)

Former-commit-id: 7b9c7141036ae01ca1d269c0748200ec4d069312
---
 .gitignore               | 10 ++--
 build/scripts/common.lua | 99 ++++++++++++++++++++++++++++++++++------
 2 files changed, 89 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 31d933d18..959844658 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,9 @@
 # Nazara build
 examples/bin/*.exe
-lib/libNazara*.a
-lib/Nazara*.dll
-lib/Nazara*.so
-SDK/lib/libNazaraSDK*.a
-SDK/lib/NazaraSDK*.dll
-SDK/lib/NazaraSDK*.so
+lib/**/libNazara*.a
+lib/**/Nazara*.dll
+lib/**/Nazara*.so
+lib/**/libNazara*.lib
 
 # Feature page
 build/scripts/features/index.html
diff --git a/build/scripts/common.lua b/build/scripts/common.lua
index c0d9acce9..6ef47d7d1 100644
--- a/build/scripts/common.lua
+++ b/build/scripts/common.lua
@@ -19,17 +19,40 @@ function NazaraBuild:Execute()
 			})
 
 			includedirs("../extlibs/include")
+			libdirs("../extlibs/lib/common")
 			location(_ACTION)
 			kind("StaticLib")
 
 			configuration("x32")
-				libdirs("../extlibs/lib/x86")
-				targetdir("../extlibs/lib/x86")
+				libdirs("../extlibs/lib/common/x86")
 
 			configuration("x64")
-				libdirs("../extlibs/lib/x64")
-				targetdir("../extlibs/lib/x64")
-				
+				libdirs("../extlibs/lib/common/x64")
+
+			configuration({"codeblocks or codelite or gmake", "x32"})
+				libdirs("../extlibs/lib/mingw/x86")
+				targetdir("../extlibs/lib/mingw/x86")
+
+			configuration({"codeblocks or codelite or gmake", "x64"})
+				libdirs("../extlibs/lib/mingw/x64")
+				targetdir("../extlibs/lib/mingw/x64")
+
+			configuration({"vs*", "x32"})
+				libdirs("../extlibs/lib/msvc/x86")
+				targetdir("../extlibs/lib/msvc/x86")
+
+			configuration({"vs*", "x64"})
+				libdirs("../extlibs/lib/msvc/x64")
+				targetdir("../extlibs/lib/msvc/x64")
+
+			configuration({"xcode3 or xcode4", "x32"})
+				libdirs("../extlibs/lib/xcode/x86")
+				targetdir("../extlibs/lib/xcode/x86")
+
+			configuration({"xcode3 or xcode4", "x64"})
+				libdirs("../extlibs/lib/xcode/x64")
+				targetdir("../extlibs/lib/xcode/x64")
+
 			configuration("Debug*")
 				flags("Symbols")
 
@@ -134,14 +157,38 @@ function NazaraBuild:Execute()
 			})
 
 			libdirs("../lib")
-			targetdir("../lib")
+			libdirs("../extlibs/lib/common")
 
 			configuration("x32")
-				libdirs("../extlibs/lib/x86")
+				libdirs("../extlibs/lib/common/x86")
 
 			configuration("x64")
 				defines("NAZARA_PLATFORM_x64")
-				libdirs("../extlibs/lib/x64")
+				libdirs("../extlibs/lib/common/x64")
+
+			configuration({"codeblocks or codelite or gmake", "x32"})
+				libdirs("../extlibs/lib/mingw/x86")
+				targetdir("../lib/mingw/x86")
+
+			configuration({"codeblocks or codelite or gmake", "x64"})
+				libdirs("../extlibs/lib/mingw/x64")
+				targetdir("../lib/mingw/x64")
+
+			configuration({"vs*", "x32"})
+				libdirs("../extlibs/lib/msvc/x86")
+				targetdir("../lib/msvc/x86")
+
+			configuration({"vs*", "x64"})
+				libdirs("../extlibs/lib/msvc/x64")
+				targetdir("../lib/msvc/x64")
+
+			configuration({"xcode3 or xcode4", "x32"})
+				libdirs("../extlibs/lib/xcode/x86")
+				targetdir("../lib/xcode/x86")
+
+			configuration({"xcode3 or xcode4", "x64"})
+				libdirs("../extlibs/lib/xcode/x64")
+				targetdir("../lib/xcode/x64")
 
 			configuration("*Static")
 				kind("StaticLib")
@@ -201,14 +248,38 @@ function NazaraBuild:Execute()
 			})
 
 			libdirs("../lib")
-			targetdir("../lib")
+			libdirs("../extlibs/lib/common")
 
 			configuration("x32")
-				libdirs("../extlibs/lib/x86")
+				libdirs("../extlibs/lib/common/x86")
 
 			configuration("x64")
 				defines("NAZARA_PLATFORM_x64")
-				libdirs("../extlibs/lib/x64")
+				libdirs("../extlibs/lib/common/x64")
+
+			configuration({"codeblocks or codelite or gmake", "x32"})
+				libdirs("../extlibs/lib/mingw/x86")
+				targetdir("../lib/mingw/x86")
+
+			configuration({"codeblocks or codelite or gmake", "x64"})
+				libdirs("../extlibs/lib/mingw/x64")
+				targetdir("../lib/mingw/x64")
+
+			configuration({"vs*", "x32"})
+				libdirs("../extlibs/lib/msvc/x86")
+				targetdir("../lib/msvc/x86")
+
+			configuration({"vs*", "x64"})
+				libdirs("../extlibs/lib/msvc/x64")
+				targetdir("../lib/msvc/x64")
+
+			configuration({"xcode3 or xcode4", "x32"})
+				libdirs("../extlibs/lib/xcode/x86")
+				targetdir("../lib/xcode/x86")
+
+			configuration({"xcode3 or xcode4", "x64"})
+				libdirs("../extlibs/lib/xcode/x64")
+				targetdir("../lib/xcode/x64")
 
 			configuration("*Static")
 				kind("StaticLib")
@@ -270,13 +341,13 @@ function NazaraBuild:Execute()
 		flags(exampleTable.Flags)
 		includedirs(exampleTable.Includes)
 		links(exampleTable.Libraries)
-		
+
 		configuration("x32")
-			libdirs("../extlibs/lib/x86")
+			libdirs("../extlibs/lib/common/x86")
 
 		configuration("x64")
 			defines("NAZARA_PLATFORM_x64")
-			libdirs("../extlibs/lib/x64")
+			libdirs("../extlibs/lib/common/x64")
 
 		for k,v in pairs(exampleTable.ConfigurationLibraries) do
 			configuration(k)