Merge pull request premake#11 from starkos/remove-deprecated-flags

Switch over to exceptionhandling() and rtti()
martin-traverse · Jun 25, 2015 · 09b5c9f · 09b5c9f
2 parents c9d27b5 + 22f9137
commit 09b5c9f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/actions/xcode/tests/test_xcode_project.lua b/src/actions/xcode/tests/test_xcode_project.lua
@@ -1481,7 +1481,7 @@
 
 
 	function suite.XCBuildConfigurationProject_OnNoExceptions()
-		flags { "NoExceptions" }
+		exceptionhandling "Off"
 		prepare()
 		xcode.XCBuildConfiguration_Project(tr, tr.configs[1])
 		test.capture [[
@@ -1559,7 +1559,7 @@
 
 
 	function suite.XCBuildConfigurationProject_OnNoRTTI()
-		flags { "NoRTTI" }
+		rtti "Off"
 		prepare()
 		xcode.XCBuildConfiguration_Project(tr, tr.configs[1])
 		test.capture [[

diff --git a/src/actions/xcode/xcode_common.lua b/src/actions/xcode/xcode_common.lua
@@ -1006,19 +1006,19 @@
 
 		settings['GCC_C_LANGUAGE_STANDARD'] = 'gnu99'
 
-		if cfg.flags.NoExceptions then
+		if cfg.exceptionhandling == p.OFF then
 			settings['GCC_ENABLE_CPP_EXCEPTIONS'] = 'NO'
 		end
 
-		if cfg.flags.NoRTTI then
+		if cfg.rtti == p.OFF then
 			settings['GCC_ENABLE_CPP_RTTI'] = 'NO'
 		end
 
 		if cfg.flags.Symbols and not cfg.flags.NoEditAndContinue then
 			settings['GCC_ENABLE_FIX_AND_CONTINUE'] = 'YES'
 		end
 
-		if cfg.flags.NoExceptions then
+		if cfg.exceptionhandling == p.OFF then
 			settings['GCC_ENABLE_OBJC_EXCEPTIONS'] = 'NO'
 		end