From 34c1479a30f02270d557e872a5c3c35da306a4ae Mon Sep 17 00:00:00 2001 From: Lynix Date: Thu, 4 Oct 2012 23:32:24 +0200 Subject: [PATCH] Renamed "one-library" build option to "united" Former-commit-id: 0578d236b4e209f1e9b35ae4302c040322e15ee8 --- build/scripts/module/audio.lua | 4 ++-- build/scripts/module/core.lua | 2 +- build/scripts/module/noise.lua | 4 ++-- build/scripts/module/renderer.lua | 4 ++-- build/scripts/module/utility.lua | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build/scripts/module/audio.lua b/build/scripts/module/audio.lua index c46087c86..07281d45f 100644 --- a/build/scripts/module/audio.lua +++ b/build/scripts/module/audio.lua @@ -1,4 +1,4 @@ -if (not _OPTIONS["one-library"]) then +if (not _OPTIONS["united"]) then project "NazaraAudio" end @@ -19,7 +19,7 @@ else -- Link posix ? end -if (_OPTIONS["one-library"]) then +if (_OPTIONS["united"]) then excludes "../src/Nazara/Audio/Debug/Leaks.cpp" else configuration "DebugStatic" diff --git a/build/scripts/module/core.lua b/build/scripts/module/core.lua index df08604da..049d27ded 100644 --- a/build/scripts/module/core.lua +++ b/build/scripts/module/core.lua @@ -1,4 +1,4 @@ -if (not _OPTIONS["one-library"]) then +if (not _OPTIONS["united"]) then project "NazaraCore" end diff --git a/build/scripts/module/noise.lua b/build/scripts/module/noise.lua index 9fb0b9f71..5a969041b 100644 --- a/build/scripts/module/noise.lua +++ b/build/scripts/module/noise.lua @@ -1,4 +1,4 @@ -if (not _OPTIONS["one-library"]) then +if (not _OPTIONS["united"]) then project "NazaraNoise" end @@ -16,7 +16,7 @@ else excludes { "../src/Nazara/Noise/Win32/*.hpp", "../src/Nazara/Noise/Win32/*.cpp" } end -if (_OPTIONS["one-library"]) then +if (_OPTIONS["united"]) then excludes "../src/Nazara/Noise/Debug/Leaks.cpp" else configuration "DebugStatic" diff --git a/build/scripts/module/renderer.lua b/build/scripts/module/renderer.lua index 09a1b260e..83eeecd57 100644 --- a/build/scripts/module/renderer.lua +++ b/build/scripts/module/renderer.lua @@ -1,4 +1,4 @@ -if (not _OPTIONS["one-library"]) then +if (not _OPTIONS["united"]) then project "NazaraRenderer" end @@ -21,7 +21,7 @@ else excludes { "../src/Nazara/Renderer/Win32/*.hpp", "../src/Nazara/Renderer/Win32/*.cpp" } end -if (_OPTIONS["one-library"]) then +if (_OPTIONS["united"]) then excludes "../src/Nazara/Renderer/Debug/Leaks.cpp" else configuration "DebugStatic" diff --git a/build/scripts/module/utility.lua b/build/scripts/module/utility.lua index 097ed0915..87ca1167e 100644 --- a/build/scripts/module/utility.lua +++ b/build/scripts/module/utility.lua @@ -1,4 +1,4 @@ -if (not _OPTIONS["one-library"]) then +if (not _OPTIONS["united"]) then project "NazaraUtility" end @@ -20,7 +20,7 @@ else excludes { "../src/Nazara/Utility/Win32/*.hpp", "../src/Nazara/Utility/Win32/*.cpp" } end -if (_OPTIONS["one-library"]) then +if (_OPTIONS["united"]) then excludes "../src/Nazara/Utility/Debug/Leaks.cpp" else configuration "DebugStatic"