diff --git a/build/scripts/common.lua b/build/scripts/common.lua
index 38c65addc..8d4a892d6 100644
--- a/build/scripts/common.lua
+++ b/build/scripts/common.lua
@@ -21,11 +21,12 @@ includedirs
 libdirs "../lib"
 
 if (_OPTIONS["x64"]) then
+	defines "NAZARA_PLATFORM_x64"
 	libdirs "../extlibs/lib/x64"
+else
+	libdirs "../extlibs/lib/x86"
 end
 
-libdirs "../extlibs/lib/x86"
-
 targetdir "../lib"
 
 configuration "Debug*"
@@ -57,7 +58,10 @@ configuration "DebugDLL"
 
 configuration "codeblocks or codelite or gmake or xcode3*"
 	buildoptions "-std=c++11"
-
+if (_OPTIONS["x64"]) then
+	buildoptions "-m64"
+end
+	
 configuration { "linux or bsd or macosx", "gmake" }
 	buildoptions "-fvisibility=hidden"
 
diff --git a/build/scripts/common_examples.lua b/build/scripts/common_examples.lua
index 3d1cdb2fe..5eb19d552 100644
--- a/build/scripts/common_examples.lua
+++ b/build/scripts/common_examples.lua
@@ -17,11 +17,12 @@ includedirs { "../include", "../extlibs/include" }
 libdirs "../lib"
 
 if (_OPTIONS["x64"]) then
+	defines "NAZARA_PLATFORM_x64"
 	libdirs "../extlibs/lib/x64"
+else
+	libdirs "../extlibs/lib/x86"
 end
 
-libdirs "../extlibs/lib/x86"
-
 targetdir "../examples/bin"
 
 configuration "Debug*"
diff --git a/build/scripts/common_extlibs.lua b/build/scripts/common_extlibs.lua
index 26d7a9426..af414ca7a 100644
--- a/build/scripts/common_extlibs.lua
+++ b/build/scripts/common_extlibs.lua
@@ -24,3 +24,8 @@ configuration "Release"
 -- Activation du SSE côté GCC
 configuration { "Release*", "codeblocks or codelite or gmake or xcode3*" }
 	buildoptions "-mfpmath=sse"
+
+if (_OPTIONS["x64"]) then
+configuration "codeblocks or codelite or gmake or xcode3*"
+	buildoptions "-m64"
+end