From cb3671fdc867b56ba36651aaa23e9d9d5a9afc76 Mon Sep 17 00:00:00 2001
From: "M. Skibbe" <tba-snoopy@gmx.de>
Date: Thu, 27 Feb 2014 13:47:51 +0100
Subject: [PATCH] add ATL support

---
 src/_premake_init.lua                         | 11 ++++++++
 src/actions/vstudio/vs200x_vcproj.lua         |  3 +--
 src/actions/vstudio/vs2010_vcxproj.lua        |  7 ++++++
 .../vstudio/vc2010/test_config_props.lua      | 25 +++++++++++++++++++
 4 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/src/_premake_init.lua b/src/_premake_init.lua
index eb8ec09e..89831bc6 100644
--- a/src/_premake_init.lua
+++ b/src/_premake_init.lua
@@ -285,6 +285,17 @@
 		},
 	}
 
+	api.register {
+		name = "ATL",
+		scope = "config",
+		kind  = "string",
+		allowed = {
+			"Off",
+			"Dynamic",
+			"Static",
+		},
+	}
+
 	api.register {
 		name = "floatingpoint",
 		scope = "config",
diff --git a/src/actions/vstudio/vs200x_vcproj.lua b/src/actions/vstudio/vs200x_vcproj.lua
index 5345aa84..14432cdd 100644
--- a/src/actions/vstudio/vs200x_vcproj.lua
+++ b/src/actions/vstudio/vs200x_vcproj.lua
@@ -146,7 +146,7 @@
 				m.configurationType,
 				m.useOfMFC,
 				m.characterSet,
-				m.managedExtensions
+				m.managedExtensions,
 			}
 		end
 	end
@@ -1551,7 +1551,6 @@
 	end
 
 
-
 	function m.usePrecompiledHeader(cfg)
 		local prj, file = config.normalize(cfg)
 		if file then
diff --git a/src/actions/vstudio/vs2010_vcxproj.lua b/src/actions/vstudio/vs2010_vcxproj.lua
index b3161f37..ad5bc897 100644
--- a/src/actions/vstudio/vs2010_vcxproj.lua
+++ b/src/actions/vstudio/vs2010_vcxproj.lua
@@ -177,6 +177,7 @@
 		"configurationType",
 		"useDebugLibraries",
 		"useOfMfc",
+		"useOfAtl",
 		"clrSupport",
 		"characterSet",
 		"wholeProgramOptimization",
@@ -1248,6 +1249,12 @@
 		end
 	end
 
+	function vc2010.useOfAtl(cfg)
+		if cfg.ATL then
+			_p(2,'<UseOfATL>%s</UseOfATL>', cfg.ATL or "nil")
+		end
+	end
+
 
 	function vc2010.warningLevel(cfg)
 		local map = { Off = "TurnOffAllWarnings", Extra = "Level4" }
diff --git a/tests/actions/vstudio/vc2010/test_config_props.lua b/tests/actions/vstudio/vc2010/test_config_props.lua
index 2286368c..3a6eaf76 100755
--- a/tests/actions/vstudio/vc2010/test_config_props.lua
+++ b/tests/actions/vstudio/vc2010/test_config_props.lua
@@ -151,6 +151,31 @@
 		]]
 	end
 
+--
+-- Check the support for building with ATL.
+--
+
+	function suite.useOfAtl_onDynamicRuntime()
+		ATL "Dynamic"
+		prepare()
+		test.capture [[
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<UseOfATL>Dynamic</UseOfATL>
+		]]
+	end
+
+	function suite.useOfAtl_onStaticRuntime()
+		ATL "Static"
+		prepare()
+		test.capture [[
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+		<ConfigurationType>Application</ConfigurationType>
+		<UseDebugLibraries>false</UseDebugLibraries>
+		<UseOfATL>Static</UseOfATL>
+		]]
+	end
 
 --
 -- Check handling of the ReleaseRuntime flag; should override the