From 6ccde01bee375cd6c22a00882719ab982268c5ba Mon Sep 17 00:00:00 2001 From: Lynix Date: Mon, 17 Jun 2013 17:29:33 +0200 Subject: [PATCH] Fixed United build option not including all files (Close #13) Former-commit-id: 8e9da1c6fa7e65ac5285abdd3f358c033c9f2174 --- build/scripts/common.lua | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/build/scripts/common.lua b/build/scripts/common.lua index 9dc951451..ab8f36140 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -36,9 +36,7 @@ configuration "Debug*" configuration "Release*" flags { "EnableSSE", "EnableSSE2", "Optimize", "OptimizeSpeed", "NoFramePointer", "NoRTTI" } --- Activation du SSE côté GCC configuration { "Release*", "codeblocks or codelite or gmake or xcode3*" } - buildoptions "-mfpmath=sse" configuration "*Static" defines "NAZARA_STATIC" @@ -57,7 +55,8 @@ configuration "DebugDLL" targetsuffix "-d" configuration "codeblocks or codelite or gmake or xcode3*" - buildoptions "-std=c++11" + buildoptions "-mfpmath=sse" -- Activation de la vectorisation du code + buildoptions "-std=c++11" -- On compile en C++11 if (_OPTIONS["x64"]) then buildoptions "-m64" end @@ -67,5 +66,3 @@ configuration { "linux or bsd or macosx", "gmake" } configuration "vs*" defines "_CRT_SECURE_NO_WARNINGS" - -configuration {} -- Fin du filtre