Replace MFC flag with a dedicated API

Author: nickclark2016

modules/vstudio/tests/vc2010/test_config_props.lua

@@ -174,7 +174,7 @@
 --
 
 	function suite.useOfMfc_onDynamicRuntime()
-		flags "MFC"
+		mfc "On"
 		prepare()
 		test.capture [[
 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -185,7 +185,7 @@
 	end
 
 	function suite.useOfMfc_onStaticRuntime()
-		flags { "MFC" }
+		mfc "On"
 		staticruntime "On"
 		prepare()
 		test.capture [[
@@ -196,6 +196,29 @@
 		]]
 	end
 
+	function suite.useOfMfc_forceStatic()
+		mfc "Static"
+		prepare()
+		test.capture [[
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+	<ConfigurationType>Application</ConfigurationType>
+	<UseDebugLibraries>false</UseDebugLibraries>
+	<UseOfMfc>Static</UseOfMfc>
+		]]
+	end
+
+	function suite.useOfMfc_forceDynamic()
+		mfc "Dynamic"
+		staticruntime "On"
+		prepare()
+		test.capture [[
+<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+	<ConfigurationType>Application</ConfigurationType>
+	<UseDebugLibraries>false</UseDebugLibraries>
+	<UseOfMfc>Dynamic</UseOfMfc>
+		]]
+	end
+
 --
 -- Check the support for building with ATL.
 --

modules/vstudio/vs200x_vcproj.lua

@@ -1539,8 +1539,12 @@
 
 
 	function m.useOfMFC(cfg)
-		if (cfg.flags.MFC) then
+		if (cfg.mfc == "On") then
 			p.w('UseOfMFC="%d"', iif(cfg.staticruntime == "On", 1, 2))
+		elseif (cfg.mfc == "Static") then
+			p.w('UseOfMFC="1"')
+		elseif (cfg.mfc == "Dynamic") then
+			p.w('UseOfMFC="2"')
 		end
 	end
 

modules/vstudio/vs2010_vcxproj.lua

@@ -3225,8 +3225,14 @@
 
 
 	function m.useOfMfc(cfg)
-		if cfg.flags.MFC then
+		if (cfg.mfc == "On") then
 			m.element("UseOfMfc", nil, iif(cfg.staticruntime == "On", "Static", "Dynamic"))
+		elseif (cfg.mfc == "Off") then
+			m.element("UseOfMfc", nil, "false")
+		elseif (cfg.mfc == "Static") then
+			m.element("UseOfMfc", nil, "Static")
+		elseif (cfg.mfc == "Dynamic") then
+			m.element("UseOfMfc", nil, "Dynamic")
 		end
 	end
 

src/_premake_init.lua

@@ -339,7 +339,6 @@
 			"FatalLinkWarnings",
 			"LinkTimeOptimization",
 			"Maps",
-			"MFC",
 			"MultiProcessorCompile",
 			"No64BitChecks",
 			"NoCopyLocal",
@@ -1094,6 +1093,19 @@
 		externalincludedirs(value)
 	end)
 
+	api.register {
+		name = "mfc",
+		scope = "config",
+		kind = "string",
+		allowed = {
+			"Default",
+			"Off",
+			"On",
+			"Static",
+			"Dynamic",
+		}
+	}
+
 -----------------------------------------------------------------------------
 --
 -- Field name aliases for backward compatibility

tests/base/test_configset.lua

@@ -177,10 +177,10 @@
 	function suite.remove_onExactValueMatch()
 		local f = field.get("flags")
 
-		local r, err = configset.store(cset, f, { "MFC", "MultiProcessorCompile", "NoPCH" })
+		local r, err = configset.store(cset, f, { "WPF", "MultiProcessorCompile", "NoPCH" })
 		test.isnil(err)
 
-		configset.remove(cset, f, { "MFC" })
+		configset.remove(cset, f, { "WPF" })
 
 		local result = configset.fetch(cset, f)
 		test.isequal({ "MultiProcessorCompile", "NoPCH" }, result)
@@ -190,10 +190,10 @@
 	function suite.remove_onMultipleValues()
 		local f = field.get("flags")
 
-		local r, err = configset.store(cset, f, { "Maps", "MFC", "MultiProcessorCompile", "NoPCH" })
+		local r, err = configset.store(cset, f, { "Maps", "WPF", "MultiProcessorCompile", "NoPCH" })
 		test.isnil(err)
 
-		configset.remove(cset, f, { "Maps", "MFC" })
+		configset.remove(cset, f, { "Maps", "WPF" })
 
 		local result = configset.fetch(cset, f)
 		test.isequal({ "MultiProcessorCompile", "NoPCH" }, result)