From ca35b95be26db2c02af71a484b854d046358ebf6 Mon Sep 17 00:00:00 2001 From: Watson Date: Thu, 5 Dec 2013 22:17:09 +0900 Subject: [PATCH] Revert "fix where Boxed#new doesn't work for GLKKit structure." This reverts commit ac89cf6b4bde5c8f7f27d61a84260418158e8242. http://hipbyte.myjetbrains.com/youtrack/issue/RM-342 Because this patch causes a conflict between method's structure signature and bridgesupport's structure signature --- lib/motion/project/xcode_config.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/motion/project/xcode_config.rb b/lib/motion/project/xcode_config.rb index 593816ee..ce39bd72 100644 --- a/lib/motion/project/xcode_config.rb +++ b/lib/motion/project/xcode_config.rb @@ -345,7 +345,7 @@ EOS sdk_path = self.sdk(local_platform) includes = ['-I.'] + headers.map { |header| "-I'#{File.dirname(header)}'" }.uniq exceptions = exceptions.map { |x| "\"#{x}\"" }.join(' ') - c_flags = "#{c_flags} -isysroot '#{sdk_path}' #{bridgesupport_cflags} -D__STRICT_ANSI__ #{includes.join(' ')}" + c_flags = "#{c_flags} -isysroot '#{sdk_path}' #{bridgesupport_cflags} #{includes.join(' ')}" sh "RUBYOPT='' '#{File.join(bindir, 'gen_bridge_metadata')}' #{bridgesupport_flags} --cflags \"#{c_flags}\" #{headers.map { |x| "'#{x}'" }.join(' ')} -o '#{bs_file}' #{ "-e #{exceptions}" if exceptions.length != 0}" end