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

Merged 2D and 3D modules into Graphics module

Browse Source 
Former-commit-id: 33bf0fbe727e50e864bc52680c95a106ada508e9
This commit is contained in:
Lynix
2013-04-03 01:14:55 +02:00
parent e52412577b
commit 34dbd19385
50 changed files with 168 additions and 393 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
build/scripts/module/3d.lua
View File

@@ -1,45 +0,0 @@
if (not _OPTIONS["united"]) then
project "Nazara3D"
end
files
{
"../include/Nazara/3D/**.hpp",
"../include/Nazara/3D/**.inl",
"../src/Nazara/3D/**.hpp",
"../src/Nazara/3D/**.cpp"
}
if (os.is("windows")) then
excludes { "../src/Nazara/3D/Posix/*.hpp", "../src/Nazara/3D/Posix/*.cpp" }
else
excludes { "../src/Nazara/3D/Win32/*.hpp", "../src/Nazara/3D/Win32/*.cpp" }
end
if (_OPTIONS["united"]) then
excludes "../src/Nazara/3D/Debug/Leaks.cpp"
else
configuration "DebugStatic"
links "NazaraCore-s-d"
links "NazaraUtility-s-d"
links "NazaraRenderer-s-d"
links "Nazara2D-s-d"
configuration "ReleaseStatic"
links "NazaraCore-s"
links "NazaraUtility-s"
links "NazaraRenderer-s"
links "Nazara2D-s"
configuration "DebugDLL"
links "NazaraCore-d"
links "NazaraUtility-d"
links "NazaraRenderer-d"
links "Nazara2D-d"
configuration "ReleaseDLL"
links "NazaraCore"
links "NazaraUtility"
links "NazaraRenderer"
links "Nazara2D"
end

16
build/scripts/module/2d.lua → build/scripts/module/graphics.lua
View File

@@ -1,23 +1,23 @@
if (not _OPTIONS["united"]) then
project "Nazara2D"
project "NazaraGraphics"
end
files
{
"../include/Nazara/2D/**.hpp",
"../include/Nazara/2D/**.inl",
"../src/Nazara/2D/**.hpp",
"../src/Nazara/2D/**.cpp"
"../include/Nazara/Graphics/**.hpp",
"../include/Nazara/Graphics/**.inl",
"../src/Nazara/Graphics/**.hpp",
"../src/Nazara/Graphics/**.cpp"
}
if (os.is("windows")) then
excludes { "../src/Nazara/2D/Posix/*.hpp", "../src/Nazara/2D/Posix/*.cpp" }
excludes { "../src/Nazara/Graphics/Posix/*.hpp", "../src/Nazara/Graphics/Posix/*.cpp" }
else
excludes { "../src/Nazara/2D/Win32/*.hpp", "../src/Nazara/2D/Win32/*.cpp" }
excludes { "../src/Nazara/Graphics/Win32/*.hpp", "../src/Nazara/Graphics/Win32/*.cpp" }
end
if (_OPTIONS["united"]) then
excludes "../src/Nazara/2D/Debug/Leaks.cpp"
excludes "../src/Nazara/Graphics/Debug/Leaks.cpp"
else
configuration "DebugStatic"
links "NazaraCore-s-d"