sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Build: Cleanup common.lua

This commit is contained in:
Jérôme Leclercq 2016-11-06 22:41:22 +01:00
parent 0de741a541
commit 0f14a57b2e
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
build/scripts/common.lua
View File

@ -124,12 +124,6 @@ function NazaraBuild:Execute()
language("C++") language("C++")
location(_ACTION) 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 -- Modules
if (_OPTIONS["united"]) then if (_OPTIONS["united"]) then
project("NazaraEngine") project("NazaraEngine")
@ -174,11 +168,11 @@ function NazaraBuild:Execute()
libdirs(moduleTable.LibraryPaths.x64) libdirs(moduleTable.LibraryPaths.x64)
for k,v in pairs(moduleTable.ConfigurationLibraries) do for k,v in pairs(moduleTable.ConfigurationLibraries) do
configuration(k) filter(k)
links(v) links(v)
end end
configuration({}) filter({})
end end
-- Tools -- Tools
@ -753,6 +747,11 @@ end
function NazaraBuild:PrepareMainWorkspace() function NazaraBuild:PrepareMainWorkspace()
self:PrepareGeneric() 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") filter("architecture:x86_64")
defines("NAZARA_PLATFORM_x64") defines("NAZARA_PLATFORM_x64")