From 278a15de62b97b83e45f06c080a936ebe9033c59 Mon Sep 17 00:00:00 2001 From: Lynix Date: Fri, 3 May 2013 12:16:32 +0200 Subject: [PATCH] Nazara will now build on 64bits target I used a new MinGW package to build these. If your doesn't work, use : 64bits: http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.8.0/64-bit/threads-win32/seh/ 32bits: http://sourceforge.net/projects/mingwbuilds/files/host-windows/releases/4.8.0/32-bit/threads-win32/dwarf/ Former-commit-id: 406181e292648f3bcd7431617c4db55eab7d918f --- build/scripts/common.lua | 10 +++++++--- build/scripts/common_examples.lua | 5 +++-- build/scripts/common_extlibs.lua | 5 +++++ 3 files changed, 15 insertions(+), 5 deletions(-) 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