From 32a217ea1b07fe64f424c3799b5e883b71400998 Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sun, 14 Jun 2015 16:17:02 +0200
Subject: [PATCH] Build: Now handle 32/64bits the right way

Former-commit-id: 5769c92df0994e91e7098df37612893fb51fdf8a
---
 build/scripts/common.lua | 58 +++++++++++++++++-----------------------
 1 file changed, 25 insertions(+), 33 deletions(-)

diff --git a/build/scripts/common.lua b/build/scripts/common.lua
index 5068b7413..c0d9acce9 100644
--- a/build/scripts/common.lua
+++ b/build/scripts/common.lua
@@ -10,6 +10,8 @@ function NazaraBuild:Execute()
 	else
 		if (#self.OrderedExtLibs > 0) then
 			solution("NazaraExtlibs")
+			platforms({"x32", "x64"})
+
 			-- Configuration générale
 			configurations({
 				"DebugStatic",
@@ -20,14 +22,14 @@ function NazaraBuild:Execute()
 			location(_ACTION)
 			kind("StaticLib")
 
-			if (_OPTIONS["x64"]) then
-				libdirs("../extlibs/lib/x64")
-				targetdir("../extlibs/lib/x64")
-			else
+			configuration("x32")
 				libdirs("../extlibs/lib/x86")
 				targetdir("../extlibs/lib/x86")
-			end
 
+			configuration("x64")
+				libdirs("../extlibs/lib/x64")
+				targetdir("../extlibs/lib/x64")
+				
 			configuration("Debug*")
 				flags("Symbols")
 
@@ -71,6 +73,7 @@ function NazaraBuild:Execute()
 		end
 
 		solution("NazaraEngine")
+		platforms({"x32", "x64"})
 
 		-- Configuration générale
 		configurations({
@@ -99,9 +102,6 @@ function NazaraBuild:Execute()
 
 		configuration("codeblocks or codelite or gmake or xcode3 or xcode4")
 			buildoptions("-std=c++11")
-		if (_OPTIONS["x64"]) then
-			buildoptions("-m64")
-		end
 
 		configuration({"linux or bsd or macosx", "gmake"})
 			buildoptions("-fvisibility=hidden")
@@ -134,15 +134,14 @@ function NazaraBuild:Execute()
 			})
 
 			libdirs("../lib")
+			targetdir("../lib")
 
-			if (_OPTIONS["x64"]) then
+			configuration("x32")
+				libdirs("../extlibs/lib/x86")
+
+			configuration("x64")
 				defines("NAZARA_PLATFORM_x64")
 				libdirs("../extlibs/lib/x64")
-			else
-				libdirs("../extlibs/lib/x86")
-			end
-
-			targetdir("../lib")
 
 			configuration("*Static")
 				kind("StaticLib")
@@ -202,15 +201,14 @@ function NazaraBuild:Execute()
 			})
 
 			libdirs("../lib")
+			targetdir("../lib")
 
-			if (_OPTIONS["x64"]) then
+			configuration("x32")
+				libdirs("../extlibs/lib/x86")
+
+			configuration("x64")
 				defines("NAZARA_PLATFORM_x64")
 				libdirs("../extlibs/lib/x64")
-			else
-				libdirs("../extlibs/lib/x86")
-			end
-
-			targetdir("../lib")
 
 			configuration("*Static")
 				kind("StaticLib")
@@ -263,14 +261,6 @@ function NazaraBuild:Execute()
 			"../extlibs/include"
 		})
 		libdirs("../lib")
-
-		if (_OPTIONS["x64"]) then
-			defines("NAZARA_PLATFORM_x64")
-			libdirs("../extlibs/lib/x64")
-		else
-			libdirs("../extlibs/lib/x86")
-		end
-
 		targetdir("../examples/bin")
 
 		files(exampleTable.Files)
@@ -280,6 +270,13 @@ function NazaraBuild:Execute()
 		flags(exampleTable.Flags)
 		includedirs(exampleTable.Includes)
 		links(exampleTable.Libraries)
+		
+		configuration("x32")
+			libdirs("../extlibs/lib/x86")
+
+		configuration("x64")
+			defines("NAZARA_PLATFORM_x64")
+			libdirs("../extlibs/lib/x64")
 
 		for k,v in pairs(exampleTable.ConfigurationLibraries) do
 			configuration(k)
@@ -292,11 +289,6 @@ end
 
 function NazaraBuild:Initialize()
 	-- Commençons par les options
-	newoption({
-		trigger     = "x64",
-		description = "Setup build project for x64 arch"
-	})
-
 	newoption({
 		trigger     = "united",
 		description = "Builds all the modules as one united library"