Merge branch 'master' into vulkan

This commit is contained in:
Jérôme Leclercq
2018-02-13 13:06:01 +01:00
425 changed files with 1939 additions and 619 deletions

View File

@@ -73,7 +73,7 @@ function NazaraBuild:Execute()
-- Extern libraries
if (self.Config["BuildDependencies"]) then
self:FilterLibDirectory("../thirdparty/lib/", targetdir)
self:FilterLibDirectory("../thirdparty/genlib/", targetdir) -- For generated libraries
for k, libTable in ipairs(self.OrderedExtLibs) do
project(libTable.Name)
@@ -788,6 +788,7 @@ function NazaraBuild:PrepareGeneric()
cppdialect("C++14")
self:FilterLibDirectory("../thirdparty/genlib/", libdirs)
self:FilterLibDirectory("../thirdparty/lib/", libdirs)
-- Fixes Premake stuff
@@ -820,6 +821,7 @@ function NazaraBuild:PrepareGeneric()
-- Setup some optimizations for release
filter("configurations:Release*")
defines("NDEBUG")
optimize("Speed")
vectorextensions("SSE2")

View File

@@ -2,7 +2,7 @@ MODULE.Name = "Core"
MODULE.Excludable = false -- Excluding the core makes no sense as everything relies on it
MODULE.Files = { -- Other files will be automatically added
"../include/Nazara/Prerequesites.hpp",
"../include/Nazara/Prerequisites.hpp",
"../include/Nazara/Math/**.hpp",
"../include/Nazara/Math/**.inl",
}