diff --git a/data/Rakefile b/data/Rakefile index f976dcb3..dd26413b 100644 --- a/data/Rakefile +++ b/data/Rakefile @@ -141,6 +141,12 @@ task :bridgesupport_files do sdk_version_headers = ((a[0].to_i * 10000) + (a[1].to_i * 100)).to_s sh "/usr/bin/gen_bridge_metadata --format complete --no-64-bit --cflags \"-isysroot #{sdk_path} -miphoneos-version-min=#{sdk_version} -DTARGET_OS_IPHONE -D__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__=#{sdk_version_headers} -framework #{framework}\" --framework #{sdk_frameworks}/#{framework}.framework > #{dest}" apply_bridgesupport_fixes(dest) + + if framework == 'Foundation' and sdk_version >= '7.0' + # In iOS 7.0, NSObject is defined in /usr/include/objc/NSObject.h + sh "/usr/bin/gen_bridge_metadata --format complete --no-64-bit --cflags \"-isysroot #{sdk_path} -miphoneos-version-min=#{sdk_version} -DTARGET_OS_IPHONE -D__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__=#{sdk_version_headers} -framework #{framework} -I#{sdk_path}/usr/include \" objc/NSObject.h > /tmp/NSObject.bridgesupport" + merge_bridgesupport dest, '/tmp/NSObject.bridgesupport' + end end end end