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

Merge remote-tracking branch 'origin/BuildSystem-Update' into NDK

Browse Source 
Conflicts:
	build/scripts/common.lua
	build/scripts/module/audio.lua
	build/scripts/module/core.lua
	build/scripts/module/graphics.lua
	build/scripts/module/lua.lua
	build/scripts/module/noise.lua
	build/scripts/module/physics.lua
	build/scripts/module/renderer.lua
	build/scripts/module/utility.lua

Former-commit-id: 8374b17a214e0efbdc7d35e81ed809f8dc9d3b79
This commit is contained in:
Lynix
2015-06-13 23:26:34 +02:00
parent 4cc8b53041 debe39501e
commit b2a248d6f5
19 changed files with 803 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
build/scripts/module/audio.lua
View File

@@ -1,38 +1,20 @@
if (not _OPTIONS["united"]) then
project "NazaraAudio"
end
MODULE.Name = "Audio"
defines "NAZARA_AUDIO_BUILD"
defines "NAZARA_AUDIO_OPENAL"
files
{
"../include/Nazara/Audio/**.hpp",
"../include/Nazara/Audio/**.inl",
"../src/Nazara/Audio/**.hpp",
"../src/Nazara/Audio/**.cpp"
MODULE.Defines = {
"NAZARA_AUDIO_OPENAL"
}
if (os.is("windows")) then
excludes { "../src/Nazara/Audio/Posix/*.hpp", "../src/Nazara/Audio/Posix/*.cpp" }
links "sndfile-1"
else
excludes { "../src/Nazara/Audio/Win32/*.hpp", "../src/Nazara/Audio/Win32/*.cpp" }
-- Link posix ?
end
MODULE.Libraries = {
"NazaraCore",
"sndfile-1"
}
if (_OPTIONS["united"]) then
excludes "../src/Nazara/Audio/Debug/NewOverload.cpp"
else
configuration "DebugStatic"
links "NazaraCore-s-d"
MODULE.OsFiles.Windows = {
"../src/Nazara/Audio/Win32/**.hpp",
"../src/Nazara/Audio/Win32/**.cpp"
}
configuration "ReleaseStatic"
links "NazaraCore-s"
configuration "DebugDLL"
links "NazaraCore-d"
configuration "ReleaseDLL"
links "NazaraCore"
end
MODULE.OsFiles.Posix = {
"../src/Nazara/Audio/Posix/**.hpp",
"../src/Nazara/Audio/Posix/**.cpp"
}

27
build/scripts/module/core.lua
View File

@@ -1,22 +1,17 @@
if (not _OPTIONS["united"]) then
project "NazaraCore"
end
MODULE.Name = "Core"
defines "NAZARA_CORE_BUILD"
files
{
MODULE.Files = { -- Les autres fichiers seront ajoutés automatiquement
"../include/Nazara/Prerequesites.hpp",
"../include/Nazara/Core/**.hpp",
"../include/Nazara/Core/**.inl",
"../include/Nazara/Math/**.hpp",
"../include/Nazara/Math/**.inl",
"../src/Nazara/Core/**.hpp",
"../src/Nazara/Core/**.cpp"
}
if (os.is("windows")) then
excludes { "../src/Nazara/Core/Posix/**.hpp", "../src/Nazara/Core/Posix/**.cpp" }
else
excludes { "../src/Nazara/Core/Win32/**.hpp", "../src/Nazara/Core/Win32/**.cpp" }
end
MODULE.OsFiles.Windows = {
"../src/Nazara/Core/Win32/**.hpp",
"../src/Nazara/Core/Win32/**.cpp"
}
MODULE.OsFiles.Posix = {
"../src/Nazara/Core/Posix/**.hpp",
"../src/Nazara/Core/Posix/**.cpp"
}

41
build/scripts/module/graphics.lua
View File

@@ -1,7 +1,6 @@
if (not _OPTIONS["united"]) then
project "NazaraGraphics"
end
MODULE.Name = "Graphics"
<<<<<<< HEAD
defines "NAZARA_GRAPHICS_BUILD"
files
@@ -10,34 +9,10 @@ files
"../include/Nazara/Graphics/**.inl",
"../src/Nazara/Graphics/**.hpp",
"../src/Nazara/Graphics/**.cpp"
=======
MODULE.Libraries = {
"NazaraCore",
"NazaraUtility",
"NazaraRenderer"
>>>>>>> origin/BuildSystem-Update
}
if (os.is("windows")) then
excludes { "../src/Nazara/Graphics/Posix/*.hpp", "../src/Nazara/Graphics/Posix/*.cpp" }
else
excludes { "../src/Nazara/Graphics/Win32/*.hpp", "../src/Nazara/Graphics/Win32/*.cpp" }
end
if (_OPTIONS["united"]) then
excludes "../src/Nazara/Graphics/Debug/NewOverload.cpp"
else
configuration "DebugStatic"
links "NazaraCore-s-d"
links "NazaraUtility-s-d"
links "NazaraRenderer-s-d"
configuration "ReleaseStatic"
links "NazaraCore-s"
links "NazaraUtility-s"
links "NazaraRenderer-s"
configuration "DebugDLL"
links "NazaraCore-d"
links "NazaraUtility-d"
links "NazaraRenderer-d"
configuration "ReleaseDLL"
links "NazaraCore"
links "NazaraUtility"
links "NazaraRenderer"
end

44
build/scripts/module/lua.lua
View File

@@ -1,41 +1,7 @@
if (not _OPTIONS["united"]) then
project "NazaraLua"
end
-- Quelle ironie
MODULE.Name = "Lua"
defines "NAZARA_LUA_BUILD"
files
{
"../include/Nazara/Lua/**.hpp",
"../include/Nazara/Lua/**.inl",
"../src/Nazara/Lua/**.hpp",
"../src/Nazara/Lua/**.cpp"
MODULE.Libraries = {
"lua",
"NazaraCore"
}
if (os.is("windows")) then
excludes { "../src/Nazara/Lua/Posix/*.hpp", "../src/Nazara/Lua/Posix/*.cpp" }
else
excludes { "../src/Nazara/Lua/Win32/*.hpp", "../src/Nazara/Lua/Win32/*.cpp" }
end
if (_OPTIONS["united"]) then
excludes "../src/Nazara/Lua/Debug/NewOverload.cpp"
else
configuration "DebugStatic"
links "NazaraCore-s-d"
configuration "ReleaseStatic"
links "NazaraCore-s"
configuration "DebugDLL"
links "NazaraCore-d"
configuration "ReleaseDLL"
links "NazaraCore"
end
configuration "Debug*"
links "lua-s-d"
configuration "Release*"
links "lua-s"

36
build/scripts/module/noise.lua
View File

@@ -1,35 +1,5 @@
if (not _OPTIONS["united"]) then
project "NazaraNoise"
end
MODULE.Name = "Noise"
defines "NAZARA_NOISE_BUILD"
files
{
"../include/Nazara/Noise/**.hpp",
"../include/Nazara/Noise/**.inl",
"../src/Nazara/Noise/**.hpp",
"../src/Nazara/Noise/**.cpp"
MODULE.Libraries = {
"NazaraCore"
}
if (os.is("windows")) then
excludes { "../src/Nazara/Noise/Posix/*.hpp", "../src/Nazara/Noise/Posix/*.cpp" }
else
excludes { "../src/Nazara/Noise/Win32/*.hpp", "../src/Nazara/Noise/Win32/*.cpp" }
end
if (_OPTIONS["united"]) then
excludes "../src/Nazara/Noise/Debug/NewOverload.cpp"
else
configuration "DebugStatic"
links "NazaraCore-s-d"
configuration "ReleaseStatic"
links "NazaraCore-s"
configuration "DebugDLL"
links "NazaraCore-d"
configuration "ReleaseDLL"
links "NazaraCore"
end

43
build/scripts/module/physics.lua
View File

@@ -1,41 +1,6 @@
if (not _OPTIONS["united"]) then
project "NazaraPhysics"
end
MODULE.Name = "Physics"
defines "NAZARA_PHYSICS_BUILD"
files
{
"../include/Nazara/Physics/**.hpp",
"../include/Nazara/Physics/**.inl",
"../src/Nazara/Physics/**.hpp",
"../src/Nazara/Physics/**.cpp"
MODULE.Libraries = {
"NazaraCore",
"newton"
}
if (os.is("windows")) then
excludes { "../src/Nazara/Physics/Posix/*.hpp", "../src/Nazara/Physics/Posix/*.cpp" }
else
excludes { "../src/Nazara/Physics/Win32/*.hpp", "../src/Nazara/Physics/Win32/*.cpp" }
end
if (_OPTIONS["united"]) then
excludes "../src/Nazara/Physics/Debug/NewOverload.cpp"
else
configuration "DebugStatic"
links "NazaraCore-s-d"
configuration "ReleaseStatic"
links "NazaraCore-s"
configuration "DebugDLL"
links "NazaraCore-d"
configuration "ReleaseDLL"
links "NazaraCore"
end
configuration "Debug*"
links "newton_d"
configuration "Release*"
links "newton"

57
build/scripts/module/renderer.lua
View File

@@ -1,43 +1,26 @@
if (not _OPTIONS["united"]) then
project "NazaraRenderer"
end
MODULE.Name = "Renderer"
defines "NAZARA_RENDERER_BUILD"
defines "NAZARA_RENDERER_OPENGL"
files
{
"../include/Nazara/Renderer/**.hpp",
"../include/Nazara/Renderer/**.inl",
"../src/Nazara/Renderer/**.hpp",
"../src/Nazara/Renderer/**.cpp"
MODULE.Defines = {
"NAZARA_RENDERER_OPENGL"
}
if (os.is("windows")) then
excludes { "../src/Nazara/Renderer/Posix/*.hpp", "../src/Nazara/Renderer/Posix/*.cpp" }
links "gdi32"
links "opengl32"
links "winmm"
else
excludes { "../src/Nazara/Renderer/Win32/*.hpp", "../src/Nazara/Renderer/Win32/*.cpp" }
end
MODULE.Libraries = {
"NazaraCore",
"NazaraUtility"
}
if (_OPTIONS["united"]) then
excludes "../src/Nazara/Renderer/Debug/NewOverload.cpp"
else
configuration "DebugStatic"
links "NazaraCore-s-d"
links "NazaraUtility-s-d"
MODULE.OsFiles.Windows = {
"../src/Nazara/Renderer/Win32/**.hpp",
"../src/Nazara/Renderer/Win32/**.cpp"
}
configuration "ReleaseStatic"
links "NazaraCore-s"
links "NazaraUtility-s"
MODULE.OsFiles.Posix = {
"../src/Nazara/Renderer/Posix/**.hpp",
"../src/Nazara/Renderer/Posix/**.cpp"
}
configuration "DebugDLL"
links "NazaraCore-d"
links "NazaraUtility-d"
configuration "ReleaseDLL"
links "NazaraCore"
links "NazaraUtility"
end
MODULE.OsLibraries.Windows = {
"gdi32",
"opengl32",
"winmm"
}

54
build/scripts/module/utility.lua
View File

@@ -1,44 +1,22 @@
if (not _OPTIONS["united"]) then
project "NazaraUtility"
end
MODULE.Name = "Utility"
defines "NAZARA_UTILITY_BUILD"
files
{
"../include/Nazara/Utility/**.hpp",
"../include/Nazara/Utility/**.inl",
"../src/Nazara/Utility/**.hpp",
"../src/Nazara/Utility/**.cpp"
MODULE.Libraries = {
"freetype-s",
"NazaraCore",
"stb_image"
}
links "freetype-s"
MODULE.OsFiles.Windows = {
"../src/Nazara/Utility/Win32/**.hpp",
"../src/Nazara/Utility/Win32/**.cpp"
}
if (os.is("windows")) then
excludes { "../src/Nazara/Utility/Posix/*.hpp", "../src/Nazara/Utility/Posix/*.cpp" }
links "gdi32"
else
excludes { "../src/Nazara/Utility/Win32/*.hpp", "../src/Nazara/Utility/Win32/*.cpp" }
end
MODULE.OsFiles.Posix = {
"../src/Nazara/Utility/Posix/**.hpp",
"../src/Nazara/Utility/Posix/**.cpp"
}
if (_OPTIONS["united"]) then
excludes "../src/Nazara/Utility/Debug/NewOverload.cpp"
else
configuration "DebugStatic"
links "NazaraCore-s-d"
MODULE.OsLibraries.Windows = {
"gdi32"
}
configuration "ReleaseStatic"
links "NazaraCore-s"
configuration "DebugDLL"
links "NazaraCore-d"
configuration "ReleaseDLL"
links "NazaraCore"
end
configuration "Debug*"
links "stb_image-s-d"
configuration "Release*"
links "stb_image-s"