From cd6b2c447a04829582c2e3eeea63d181baf0681f Mon Sep 17 00:00:00 2001 From: Lynix Date: Sat, 18 Aug 2012 14:08:14 +0200 Subject: [PATCH] Fixed modules target names --- .../build/scripts/module/modulename.lua | 11 ++++------- build/scripts/common.lua | 10 +++++++++- build/scripts/module/core.lua | 8 -------- build/scripts/module/noise.lua | 8 ++------ build/scripts/module/renderer.lua | 12 ++++-------- build/scripts/module/utility.lua | 8 ++------ examples/AnimatedMesh/build.lua | 16 ++++++++-------- examples/ListSequences/build.lua | 12 ++++++------ 8 files changed, 35 insertions(+), 50 deletions(-) diff --git a/NazaraModuleTemplate/build/scripts/module/modulename.lua b/NazaraModuleTemplate/build/scripts/module/modulename.lua index c1d8d7d12..421c42306 100644 --- a/NazaraModuleTemplate/build/scripts/module/modulename.lua +++ b/NazaraModuleTemplate/build/scripts/module/modulename.lua @@ -17,21 +17,18 @@ else end if (_OPTIONS["one-library"]) then - excludes "../src/Nazara/Audio/Debug/Leaks.cpp" + excludes "../src/Nazara/ModuleName/Debug/Leaks.cpp" else configuration "DebugStatic" - links "NazaraCored-s" - targetname "NazaraModuleNamed" + links "NazaraCore-s-d" configuration "ReleaseStatic" links "NazaraCore-s" - targetname "NazaraModuleName" configuration "DebugDLL" - links "NazaraCored" - targetname "NazaraModuleNamed" + links "NazaraCore-d" configuration "ReleaseDLL" links "NazaraCore" - targetname "NazaraModuleName" +end end \ No newline at end of file diff --git a/build/scripts/common.lua b/build/scripts/common.lua index 797db69d4..faaa95654 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -38,11 +38,19 @@ configuration "Release*" configuration "*Static" defines "NAZARA_STATIC" kind "StaticLib" - targetsuffix "-s" configuration "*DLL" kind "SharedLib" +configuration "DebugStatic" + targetsuffix "-s-d" + +configuration "ReleaseStatic" + targetsuffix "-s" + +configuration "DebugDLL" + targetsuffix "-d" + configuration "codeblocks or codelite or gmake or xcode3*" buildoptions "-std=c++11" diff --git a/build/scripts/module/core.lua b/build/scripts/module/core.lua index fcd8efb4d..df08604da 100644 --- a/build/scripts/module/core.lua +++ b/build/scripts/module/core.lua @@ -17,12 +17,4 @@ 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 - -if (not _OPTIONS["one-library"]) then - configuration "Debug*" - targetname "NazaraCored" - - configuration "Release*" - targetname "NazaraCore" end \ No newline at end of file diff --git a/build/scripts/module/noise.lua b/build/scripts/module/noise.lua index 0d9cc325e..9fb0b9f71 100644 --- a/build/scripts/module/noise.lua +++ b/build/scripts/module/noise.lua @@ -20,18 +20,14 @@ if (_OPTIONS["one-library"]) then excludes "../src/Nazara/Noise/Debug/Leaks.cpp" else configuration "DebugStatic" - links "NazaraCored-s" - targetname "NazaraNoised" + links "NazaraCore-s-d" configuration "ReleaseStatic" links "NazaraCore-s" - targetname "NazaraNoise" configuration "DebugDLL" - links "NazaraCored" - targetname "NazaraNoised" + links "NazaraCore-d" configuration "ReleaseDLL" links "NazaraCore" - targetname "NazaraNoise" end \ No newline at end of file diff --git a/build/scripts/module/renderer.lua b/build/scripts/module/renderer.lua index 7419c05b0..391830ee2 100644 --- a/build/scripts/module/renderer.lua +++ b/build/scripts/module/renderer.lua @@ -23,22 +23,18 @@ if (_OPTIONS["one-library"]) then excludes "../src/Nazara/Renderer/Debug/Leaks.cpp" else configuration "DebugStatic" - links "NazaraCored-s" - links "NazaraUtilityd-s" - targetname "NazaraRendererd" + links "NazaraCore-s-d" + links "NazaraUtility-s-d" configuration "ReleaseStatic" links "NazaraCore-s" links "NazaraUtility-s" - targetname "NazaraRenderer" configuration "DebugDLL" - links "NazaraCored" - links "NazaraUtilityd" - targetname "NazaraRendererd" + links "NazaraCore-d" + links "NazaraUtility-d" configuration "ReleaseDLL" links "NazaraCore" links "NazaraUtility" - targetname "NazaraRenderer" end \ No newline at end of file diff --git a/build/scripts/module/utility.lua b/build/scripts/module/utility.lua index 81091bcef..097ed0915 100644 --- a/build/scripts/module/utility.lua +++ b/build/scripts/module/utility.lua @@ -24,18 +24,14 @@ if (_OPTIONS["one-library"]) then excludes "../src/Nazara/Utility/Debug/Leaks.cpp" else configuration "DebugStatic" - links "NazaraCored-s" - targetname "NazaraUtilityd" + links "NazaraCore-s-d" configuration "ReleaseStatic" links "NazaraCore-s" - targetname "NazaraUtility" configuration "DebugDLL" - links "NazaraCored" - targetname "NazaraUtilityd" + links "NazaraCore-d" configuration "ReleaseDLL" links "NazaraCore" - targetname "NazaraUtility" end \ No newline at end of file diff --git a/examples/AnimatedMesh/build.lua b/examples/AnimatedMesh/build.lua index d45cb5983..4704ecca7 100644 --- a/examples/AnimatedMesh/build.lua +++ b/examples/AnimatedMesh/build.lua @@ -4,21 +4,21 @@ files "main.cpp" if (_OPTIONS["one-library"]) then configuration "DebugStatic" - links "Nazarad-s" + links "Nazara-s-d" configuration "ReleaseStatic" links "Nazara-s" configuration "DebugDLL" - links "Nazarad" + links "Nazara-d" configuration "ReleaseDLL" links "Nazara" else configuration "DebugStatic" - links "NazaraRendererd-s" - links "NazaraUtilityd-s" - links "NazaraCored-s" + links "NazaraRenderer-s-d" + links "NazaraUtility-s-d" + links "NazaraCore-s-d" configuration "ReleaseStatic" links "NazaraRenderer-s" @@ -26,9 +26,9 @@ else links "NazaraCore-s" configuration "DebugDLL" - links "NazaraRendererd" - links "NazaraCored" - links "NazaraUtilityd" + links "NazaraRenderer-d" + links "NazaraCore-d" + links "NazaraUtility-d" configuration "ReleaseDLL" links "NazaraRenderer" diff --git a/examples/ListSequences/build.lua b/examples/ListSequences/build.lua index a522b53f6..788fee7b6 100644 --- a/examples/ListSequences/build.lua +++ b/examples/ListSequences/build.lua @@ -4,28 +4,28 @@ files "main.cpp" if (_OPTIONS["one-library"]) then configuration "DebugStatic" - links "Nazarad-s" + links "Nazara-s-d" configuration "ReleaseStatic" links "Nazara-s" configuration "DebugDLL" - links "Nazarad" + links "Nazara-d" configuration "ReleaseDLL" links "Nazara" else configuration "DebugStatic" - links "NazaraCored-s" - links "NazaraUtilityd-s" + links "NazaraCore-s-d" + links "NazaraUtility-s-d" configuration "ReleaseStatic" links "NazaraCore-s" links "NazaraUtility-s" configuration "DebugDLL" - links "NazaraCored" - links "NazaraUtilityd" + links "NazaraCore-d" + links "NazaraUtility-d" configuration "ReleaseDLL" links "NazaraCore"