Merge pull request premake#13 from jtouton/xcode

Updated fetchfiltered to match changes in configset.fetch.
Blizzard · Sep 3, 2015 · db6b91e · db6b91e
2 parents c1f69cf + 7406493
commit db6b91e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/xcode_tree.lua b/xcode_tree.lua
@@ -769,22 +769,21 @@
 		settings.EXECUTABLE_PREFIX = targetprefix
 
 		local warn = nil
-		local inheritwarn = true
 		if warnings == 'Extra' then
 			warn = { '-Wall' }
 		elseif warnings == 'Off' then
 			settings.GCC_WARN_INHIBIT_ALL_WARNINGS = true
 		elseif warnings == 'Default' then
 			settings.GCC_WARN_INHIBIT_ALL_WARNINGS = false
-			inheritwarn = false
 		end
 
 		if disablewarnings then
 			disablewarnings = #deldisablewarnings > 0 and disablewarnings or newdisablewarnings
 			if #disablewarnings > 0 then
-				warn = table.translate(disablewarnings, function(warning)
+				warn = warn or { }
+				table.insertflat(warn, table.translate(disablewarnings, function(warning)
 					return '-Wno-' .. warning
-				end)
+				end))
 				if #deldisablewarnings == 0 and #warn > 0 then
 					warn = table.join('$(inherited)', warn)
 				end

diff --git a/xcode_utils.lua b/xcode_utils.lua
@@ -327,10 +327,5 @@
 
 
 	function xcode6.fetchfiltered(cfg, field, terms, ctx)
-		local value = configset.fetch(cfg._cfgset, field, terms, ctx and ctx._cfgset)
-		if value and field.tokens then
-			value = detoken.expand(value, cfg.environ, field, cfg._basedir)
-		end
-
-		return value
+		return configset.fetch(cfg._cfgset, field, terms, cfg, ctx and ctx._cfgset)
 	end