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

Fixed modules target names

This commit is contained in:
Lynix 2012-08-18 14:08:14 +02:00
parent 0bb693c148
commit cd6b2c447a
8 changed files with 35 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
NazaraModuleTemplate/build/scripts/module/modulename.lua
View File

@ -17,21 +17,18 @@ else
end end
if (_OPTIONS["one-library"]) then if (_OPTIONS["one-library"]) then
excludes "../src/Nazara/Audio/Debug/Leaks.cpp" excludes "../src/Nazara/ModuleName/Debug/Leaks.cpp"
else else
configuration "DebugStatic" configuration "DebugStatic"
links "NazaraCored-s" links "NazaraCore-s-d"
targetname "NazaraModuleNamed"
configuration "ReleaseStatic" configuration "ReleaseStatic"
links "NazaraCore-s" links "NazaraCore-s"
targetname "NazaraModuleName"
configuration "DebugDLL" configuration "DebugDLL"
links "NazaraCored" links "NazaraCore-d"
targetname "NazaraModuleNamed"
configuration "ReleaseDLL" configuration "ReleaseDLL"
links "NazaraCore" links "NazaraCore"
targetname "NazaraModuleName" end
end end

10
build/scripts/common.lua
View File

@ -38,11 +38,19 @@ configuration "Release*"
configuration "*Static" configuration "*Static"
defines "NAZARA_STATIC" defines "NAZARA_STATIC"
kind "StaticLib" kind "StaticLib"
targetsuffix "-s"
configuration "*DLL" configuration "*DLL"
kind "SharedLib" kind "SharedLib"
configuration "DebugStatic"
targetsuffix "-s-d"
configuration "ReleaseStatic"
targetsuffix "-s"
configuration "DebugDLL"
targetsuffix "-d"
configuration "codeblocks or codelite or gmake or xcode3*" configuration "codeblocks or codelite or gmake or xcode3*"
buildoptions "-std=c++11" buildoptions "-std=c++11"

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

@ -17,12 +17,4 @@ if (os.is("windows")) then
excludes { "../src/Nazara/Core/Posix/**.hpp", "../src/Nazara/Core/Posix/**.cpp" } excludes { "../src/Nazara/Core/Posix/**.hpp", "../src/Nazara/Core/Posix/**.cpp" }
else else
excludes { "../src/Nazara/Core/Win32/**.hpp", "../src/Nazara/Core/Win32/**.cpp" } excludes { "../src/Nazara/Core/Win32/**.hpp", "../src/Nazara/Core/Win32/**.cpp" }
end
if (not _OPTIONS["one-library"]) then
configuration "Debug*"
targetname "NazaraCored"
configuration "Release*"
targetname "NazaraCore"
end end

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

@ -20,18 +20,14 @@ if (_OPTIONS["one-library"]) then
excludes "../src/Nazara/Noise/Debug/Leaks.cpp" excludes "../src/Nazara/Noise/Debug/Leaks.cpp"
else else
configuration "DebugStatic" configuration "DebugStatic"
links "NazaraCored-s" links "NazaraCore-s-d"
targetname "NazaraNoised"
configuration "ReleaseStatic" configuration "ReleaseStatic"
links "NazaraCore-s" links "NazaraCore-s"
targetname "NazaraNoise"
configuration "DebugDLL" configuration "DebugDLL"
links "NazaraCored" links "NazaraCore-d"
targetname "NazaraNoised"
configuration "ReleaseDLL" configuration "ReleaseDLL"
links "NazaraCore" links "NazaraCore"
targetname "NazaraNoise"
end end

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

@ -23,22 +23,18 @@ if (_OPTIONS["one-library"]) then
excludes "../src/Nazara/Renderer/Debug/Leaks.cpp" excludes "../src/Nazara/Renderer/Debug/Leaks.cpp"
else else
configuration "DebugStatic" configuration "DebugStatic"
links "NazaraCored-s" links "NazaraCore-s-d"
links "NazaraUtilityd-s" links "NazaraUtility-s-d"
targetname "NazaraRendererd"
configuration "ReleaseStatic" configuration "ReleaseStatic"
links "NazaraCore-s" links "NazaraCore-s"
links "NazaraUtility-s" links "NazaraUtility-s"
targetname "NazaraRenderer"
configuration "DebugDLL" configuration "DebugDLL"
links "NazaraCored" links "NazaraCore-d"
links "NazaraUtilityd" links "NazaraUtility-d"
targetname "NazaraRendererd"
configuration "ReleaseDLL" configuration "ReleaseDLL"
links "NazaraCore" links "NazaraCore"
links "NazaraUtility" links "NazaraUtility"
targetname "NazaraRenderer"
end end

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

@ -24,18 +24,14 @@ if (_OPTIONS["one-library"]) then
excludes "../src/Nazara/Utility/Debug/Leaks.cpp" excludes "../src/Nazara/Utility/Debug/Leaks.cpp"
else else
configuration "DebugStatic" configuration "DebugStatic"
links "NazaraCored-s" links "NazaraCore-s-d"
targetname "NazaraUtilityd"
configuration "ReleaseStatic" configuration "ReleaseStatic"
links "NazaraCore-s" links "NazaraCore-s"
targetname "NazaraUtility"
configuration "DebugDLL" configuration "DebugDLL"
links "NazaraCored" links "NazaraCore-d"
targetname "NazaraUtilityd"
configuration "ReleaseDLL" configuration "ReleaseDLL"
links "NazaraCore" links "NazaraCore"
targetname "NazaraUtility"
end end

16
examples/AnimatedMesh/build.lua
View File

@ -4,21 +4,21 @@ files "main.cpp"
if (_OPTIONS["one-library"]) then if (_OPTIONS["one-library"]) then
configuration "DebugStatic" configuration "DebugStatic"
links "Nazarad-s" links "Nazara-s-d"
configuration "ReleaseStatic" configuration "ReleaseStatic"
links "Nazara-s" links "Nazara-s"
configuration "DebugDLL" configuration "DebugDLL"
links "Nazarad" links "Nazara-d"
configuration "ReleaseDLL" configuration "ReleaseDLL"
links "Nazara" links "Nazara"
else else
configuration "DebugStatic" configuration "DebugStatic"
links "NazaraRendererd-s" links "NazaraRenderer-s-d"
links "NazaraUtilityd-s" links "NazaraUtility-s-d"
links "NazaraCored-s" links "NazaraCore-s-d"
configuration "ReleaseStatic" configuration "ReleaseStatic"
links "NazaraRenderer-s" links "NazaraRenderer-s"
@ -26,9 +26,9 @@ else
links "NazaraCore-s" links "NazaraCore-s"
configuration "DebugDLL" configuration "DebugDLL"
links "NazaraRendererd" links "NazaraRenderer-d"
links "NazaraCored" links "NazaraCore-d"
links "NazaraUtilityd" links "NazaraUtility-d"
configuration "ReleaseDLL" configuration "ReleaseDLL"
links "NazaraRenderer" links "NazaraRenderer"

12
examples/ListSequences/build.lua
View File

@ -4,28 +4,28 @@ files "main.cpp"
if (_OPTIONS["one-library"]) then if (_OPTIONS["one-library"]) then
configuration "DebugStatic" configuration "DebugStatic"
links "Nazarad-s" links "Nazara-s-d"
configuration "ReleaseStatic" configuration "ReleaseStatic"
links "Nazara-s" links "Nazara-s"
configuration "DebugDLL" configuration "DebugDLL"
links "Nazarad" links "Nazara-d"
configuration "ReleaseDLL" configuration "ReleaseDLL"
links "Nazara" links "Nazara"
else else
configuration "DebugStatic" configuration "DebugStatic"
links "NazaraCored-s" links "NazaraCore-s-d"
links "NazaraUtilityd-s" links "NazaraUtility-s-d"
configuration "ReleaseStatic" configuration "ReleaseStatic"
links "NazaraCore-s" links "NazaraCore-s"
links "NazaraUtility-s" links "NazaraUtility-s"
configuration "DebugDLL" configuration "DebugDLL"
links "NazaraCored" links "NazaraCore-d"
links "NazaraUtilityd" links "NazaraUtility-d"
configuration "ReleaseDLL" configuration "ReleaseDLL"
links "NazaraCore" links "NazaraCore"