From bd0c99c687f0fbde5edc5a8126713d73f8db3a0b Mon Sep 17 00:00:00 2001 From: Lynix Date: Wed, 28 Sep 2016 13:55:27 +0200 Subject: [PATCH] UnitTest: Enable RTTI Former-commit-id: 99410bd952b14a187de04632ae041fd556a66e34 [formerly 85c10d4f7f2251c67cc14f1e7b10bac7092681e7] [formerly 4cd0ef1e6cbe595673dfb71ba82f4620dde4413e [formerly 3b7b24b4cad4e0abd4fb2faf7c9305ca75462028]] Former-commit-id: 4419ea87112eb630430b46e5a8c0a3c155925df3 [formerly 83f3c7cab613c17d504484937fedca9ab09329ea] Former-commit-id: 1455045645ef8e3ca74b49488b3d53adaf7e3d55 --- build/scripts/common.lua | 7 ++++++- build/scripts/tools/unittests.lua | 1 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/build/scripts/common.lua b/build/scripts/common.lua index e6f231960..b134bf4e3 100644 --- a/build/scripts/common.lua +++ b/build/scripts/common.lua @@ -141,7 +141,6 @@ function NazaraBuild:Execute() configuration("Release*") flags("NoFramePointer") optimize("Speed") - rtti("Off") vectorextensions("SSE2") configuration({"Release*", "codeblocks or codelite or gmake or xcode3 or xcode4"}) @@ -243,6 +242,9 @@ function NazaraBuild:Execute() configuration("DebugDynamic") targetsuffix("-d") + configuration("Release*") + rtti(moduleTable.EnableRTTI and "On" or "Off") + configuration({}) files(moduleTable.Files) @@ -361,6 +363,9 @@ function NazaraBuild:Execute() configuration("*Static") defines("NAZARA_STATIC") + configuration("Release*") + rtti(toolTable.EnableRTTI and "On" or "Off") + if (toolTable.Kind == "library" or toolTable.Kind == "plugin") then configuration("*Static") kind("StaticLib") diff --git a/build/scripts/tools/unittests.lua b/build/scripts/tools/unittests.lua index 5dcf6e215..f58b0eee0 100644 --- a/build/scripts/tools/unittests.lua +++ b/build/scripts/tools/unittests.lua @@ -2,6 +2,7 @@ TOOL.Name = "UnitTests" TOOL.Directory = "../tests" TOOL.EnableConsole = true +TOOL.EnableRTTI = true TOOL.Kind = "Application" TOOL.TargetDirectory = TOOL.Directory