From 0f14a57b2e1a4552b9280929fe07b79767893aa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Leclercq?= Date: Sun, 6 Nov 2016 22:41:22 +0100 Subject: [PATCH] Build: Cleanup common.lua --- build/scripts/common.lua | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build/scripts/common.lua b/build/scripts/common.lua index dc340a12e..2fed34c43 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -124,12 +124,6 @@ function NazaraBuild:Execute() language("C++") location(_ACTION) - configuration("vs*") - buildoptions({"/MP", "/bigobj"}) -- Multiprocessus build and big .obj - flags("NoMinimalRebuild") - defines("_CRT_SECURE_NO_WARNINGS") - defines("_SCL_SECURE_NO_WARNINGS") - -- Modules if (_OPTIONS["united"]) then project("NazaraEngine") @@ -174,11 +168,11 @@ function NazaraBuild:Execute() libdirs(moduleTable.LibraryPaths.x64) for k,v in pairs(moduleTable.ConfigurationLibraries) do - configuration(k) + filter(k) links(v) end - configuration({}) + filter({}) end -- Tools @@ -753,6 +747,11 @@ end function NazaraBuild:PrepareMainWorkspace() self:PrepareGeneric() + filter("action:vs*") + buildoptions({"/MP", "/bigobj"}) -- Multiprocessus build and big .obj + defines("_CRT_SECURE_NO_WARNINGS") + defines("_SCL_SECURE_NO_WARNINGS") + filter("architecture:x86_64") defines("NAZARA_PLATFORM_x64")