Merge branch 'master' into feature/fix-os-return

modules/vstudio/tests/vc2010/test_link.lua

@@ -722,3 +722,19 @@
 </Link>
 		]]
 	end
+
+	--
+-- Test ignoring default libraries with extensions specified.
+--
+
+	function suite.assemblyDebug()
+		assemblydebug "true"
+		prepare()
+		test.capture [[
+<Link>
+	<SubSystem>Windows</SubSystem>
+	<ImportLibrary>bin\Debug\MyProject.lib</ImportLibrary>
+	<AssemblyDebug>true</AssemblyDebug>
+</Link>
+		]]
+	end

modules/vstudio/vs2010_vcxproj.lua

@@ -507,6 +507,7 @@
 				m.targetMachine,
 				m.additionalLinkOptions,
 				m.programDatabaseFile,
+				m.assemblyDebug,
 			}
 		end
 	end
@@ -1811,6 +1812,12 @@
 		end
 	end
 
+	function m.assemblyDebug(cfg)
+		if cfg.assemblydebug then
+      		m.element("AssemblyDebug", nil, "true")
+		end
+	end
+
 
 	function m.functionLevelLinking(cfg)
 		if cfg.functionlevellinking ~= nil then

src/_premake_init.lua

@@ -1374,6 +1374,12 @@
 		}
 	}
 
+	api.register {
+		name = "assemblydebug",
+		scope = "config",
+		kind  = "boolean"
+	}	
+
 -----------------------------------------------------------------------------
 --
 -- Field name aliases for backward compatibility