ref: bbc0cb2b2cd7e6ad1421477c374b98a4dda3918b
parent: 4ab1dc0b89b617c6c3e07cc0f89abe93bcc28cb0
parent: 4e8428fbfca31a3132e8bfc59150daf06050b2eb
author: volvet <qizh@cisco.com>
date: Wed Apr 16 13:34:41 EDT 2014
Merge pull request #700 from mstorsjo/disable-neon-arm64 Updated XCode projects to properly launch for arm64 architecture
--- a/codec/build/iOS/common/common.xcodeproj/project.pbxproj
+++ b/codec/build/iOS/common/common.xcodeproj/project.pbxproj
@@ -418,10 +418,15 @@
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PREPROCESSOR_DEFINITIONS = "";
- "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = (
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=arm64]" = APPLE_IOS;
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7]" = (
APPLE_IOS,
HAVE_NEON,
);
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7s]" = (
+ APPLE_IOS,
+ HAVE_NEON,
+ );
"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
IPHONEOS_DEPLOYMENT_TARGET = 6.1;
ONLY_ACTIVE_ARCH = NO;
@@ -440,7 +445,12 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
DSTROOT = /tmp/common.dst;
GCC_C_LANGUAGE_STANDARD = "compiler-default";
- "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = (
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=arm64]" = APPLE_IOS;
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7]" = (
+ APPLE_IOS,
+ HAVE_NEON,
+ );
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7s]" = (
APPLE_IOS,
HAVE_NEON,
);
--- a/codec/build/iOS/dec/welsdec/welsdec.xcodeproj/project.pbxproj
+++ b/codec/build/iOS/dec/welsdec/welsdec.xcodeproj/project.pbxproj
@@ -551,10 +551,15 @@
DSTROOT = /tmp/welsdec.dst;
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PREPROCESSOR_DEFINITIONS = "";
- "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = (
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=arm64]" = APPLE_IOS;
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7]" = (
APPLE_IOS,
HAVE_NEON,
);
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7s]" = (
+ APPLE_IOS,
+ HAVE_NEON,
+ );
"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../../common/inc",
@@ -577,7 +582,12 @@
CLANG_CXX_LIBRARY = "compiler-default";
CODE_SIGN_IDENTITY = "iPhone Developer";
DSTROOT = /tmp/welsdec.dst;
- "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = (
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=arm64]" = APPLE_IOS;
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7]" = (
+ APPLE_IOS,
+ HAVE_NEON,
+ );
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7s]" = (
APPLE_IOS,
HAVE_NEON,
);
--- a/codec/build/iOS/enc/welsenc/welsenc.xcodeproj/project.pbxproj
+++ b/codec/build/iOS/enc/welsenc/welsenc.xcodeproj/project.pbxproj
@@ -632,13 +632,16 @@
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_OPTIMIZATION_LEVEL = 3;
GCC_PREPROCESSOR_DEFINITIONS = "";
- "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = (
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=arm64]" = APPLE_IOS;
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7]" = (
APPLE_IOS,
HAVE_NEON,
);
- "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = (
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7s]" = (
APPLE_IOS,
+ HAVE_NEON,
);
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../../common/inc",
"$(SRCROOT)/../../../../processing/interface",
@@ -664,13 +667,16 @@
DSTROOT = /tmp/welsenc.dst;
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_PREPROCESSOR_DEFINITIONS = "";
- "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = (
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=arm64]" = APPLE_IOS;
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7]" = (
APPLE_IOS,
HAVE_NEON,
);
- "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = (
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7s]" = (
APPLE_IOS,
+ HAVE_NEON,
);
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../../common/inc",
"$(SRCROOT)/../../../../processing/interface",
--- a/codec/processing/build/iOS/processing.xcodeproj/project.pbxproj
+++ b/codec/processing/build/iOS/processing.xcodeproj/project.pbxproj
@@ -540,10 +540,15 @@
DSTROOT = /tmp/processing.dst;
GCC_C_LANGUAGE_STANDARD = "compiler-default";
GCC_OPTIMIZATION_LEVEL = 3;
- "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = (
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=arm64]" = APPLE_IOS;
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7]" = (
APPLE_IOS,
HAVE_NEON,
);
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7s]" = (
+ APPLE_IOS,
+ HAVE_NEON,
+ );
"GCC_PREPROCESSOR_DEFINITIONS[sdk=iphonesimulator*]" = APPLE_IOS;
HEADER_SEARCH_PATHS = (
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -570,7 +575,12 @@
CODE_SIGN_IDENTITY = "iPhone Developer";
DSTROOT = /tmp/processing.dst;
GCC_C_LANGUAGE_STANDARD = "compiler-default";
- "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*]" = (
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=arm64]" = APPLE_IOS;
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7]" = (
+ APPLE_IOS,
+ HAVE_NEON,
+ );
+ "GCC_PREPROCESSOR_DEFINITIONS[sdk=iphoneos*][arch=armv7s]" = (
APPLE_IOS,
HAVE_NEON,
);