Merge branch 'pr4' of https://github.com/Blizzard/premake-core

src/_premake_init.lua

@@ -403,7 +403,7 @@
 			"OptimizeSize",        -- DEPRECATED
 			"OptimizeSpeed",       -- DEPRECATED
 			"RelativeLinks",
-			"ReleaseRuntime",
+			"ReleaseRuntime",      -- DEPRECATED
 			"SEH",
 			"ShadowedVariables",
 			"StaticRuntime",
@@ -630,6 +630,16 @@
 		}
 	}
 
+	api.register {
+		name = "runtime",
+		scope = "config",
+		kind = "string",
+		allowed = {
+			"Debug",
+			"Release",
+		}
+	}
+
 	api.register {
 		name = "pchheader",
 		scope = "config",
@@ -954,6 +964,12 @@
 		optimize "Off"
 	end)
 
+	api.deprecateValue("flags", { "ReleaseRuntime" }, nil,
+	function(value)
+		runtime 'Release'
+	end,
+	function(value)
+	end)
 
 	api.deprecateValue("flags", { "Optimise", "OptimiseSize", "OptimiseSpeed" }, nil,
 	function(value)

src/base/config.lua

@@ -320,8 +320,11 @@
 
 	function config.getruntime(cfg)
 		local linkage = iif(cfg.flags.StaticRuntime, "Static", "Shared")
-		local mode = iif(config.isDebugBuild(cfg) and not cfg.flags.ReleaseRuntime, "Debug", "Release")
-		return linkage .. mode
+		if (cfg.runtime == nil) then
+			return linkage .. iif(config.isDebugBuild(cfg), "Debug", "Release")
+		else
+			return linkage .. cfg.runtime
+		end
 	end