ref: cb1c0f9b5a8b5103d88a561f301073b754334f1e
parent: 310137d045907d1717f751aa5de0173a051728a3
author: zhuling13 <[email protected]>
date: Thu Jun 5 22:44:22 EDT 2014
modify
--- a/Makefile
+++ b/Makefile
@@ -178,7 +178,7 @@
include test/encoder/targets.mk
include test/processing/targets.mk
-LIBRARIES += $(LIBPREFIX)ut.$(LIBSUFFX)
+LIBRARIES += $(LIBPREFIX)ut.$(LIBSUFFIX)
$(LIBPREFIX)ut.$(LIBSUFFIX): $(DECODER_UNITTEST_OBJS) $(ENCODER_UNITTEST_OBJS) $(PROCESSING_UNITTEST_OBJS) $(API_TEST_OBJS)
$(QUIET)rm -f $@
$(QUIET_AR)$(AR) $(AR_OPTS) $+
--- a/build/platform-ios.mk
+++ b/build/platform-ios.mk
@@ -1,6 +1,7 @@
#ifeq ($(filter %86 armv7 armv7s arm64, $(ARCH)),)
#$(error Default ARCH is the build platform not ios devices platform,should pass ARCH to make,only support ARCH of %86 armv7 armv7s arm64)
#endif
+ARCH=armv7
include build/platform-darwin.mk
CXX = clang++
CC = clang
--- a/test/build/ios/codec_unittest/codec_unittest.xcodeproj/project.pbxproj
+++ b/test/build/ios/codec_unittest/codec_unittest.xcodeproj/project.pbxproj
@@ -18,23 +18,8 @@
54EABE991940453B00F70476 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 54EABE971940453B00F70476 /* Main.storyboard */; }; 54EABE9C1940453B00F70476 /* ViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 54EABE9B1940453B00F70476 /* ViewController.m */; }; 54EABE9E1940453B00F70476 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 54EABE9D1940453B00F70476 /* Images.xcassets */; };- 54EABEA51940453C00F70476 /* XCTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54EABEA41940453C00F70476 /* XCTest.framework */; };- 54EABEA61940453C00F70476 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54EABE851940453B00F70476 /* Foundation.framework */; };- 54EABEA71940453C00F70476 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 54EABE891940453B00F70476 /* UIKit.framework */; };- 54EABEAF1940453C00F70476 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 54EABEAD1940453C00F70476 /* InfoPlist.strings */; };- 54EABEB11940453C00F70476 /* codec_unittestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 54EABEB01940453C00F70476 /* codec_unittestTests.m */; };/* End PBXBuildFile section */
-/* Begin PBXContainerItemProxy section */
- 54EABEA81940453C00F70476 /* PBXContainerItemProxy */ = {- isa = PBXContainerItemProxy;
- containerPortal = 54EABE7A1940453B00F70476 /* Project object */;
- proxyType = 1;
- remoteGlobalIDString = 54EABE811940453B00F70476;
- remoteInfo = codec_unittest;
- };
-/* End PBXContainerItemProxy section */
-
/* Begin PBXFileReference section */
5447AB0019404B54001CD240 /* libgtest.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgtest.a; path = ../../../../libgtest.a; sourceTree = "<group>"; }; 5447AB0119404B54001CD240 /* libopenh264.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopenh264.a; path = ../../../../libopenh264.a; sourceTree = "<group>"; };@@ -52,11 +37,6 @@
54EABE9A1940453B00F70476 /* ViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ViewController.h; sourceTree = "<group>"; }; 54EABE9B1940453B00F70476 /* ViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ViewController.m; sourceTree = "<group>"; }; 54EABE9D1940453B00F70476 /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Images.xcassets; sourceTree = "<group>"; };- 54EABEA31940453C00F70476 /* codec_unittestTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = codec_unittestTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };- 54EABEA41940453C00F70476 /* XCTest.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = XCTest.framework; path = Library/Frameworks/XCTest.framework; sourceTree = DEVELOPER_DIR; };- 54EABEAC1940453C00F70476 /* codec_unittestTests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "codec_unittestTests-Info.plist"; sourceTree = "<group>"; };- 54EABEAE1940453C00F70476 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };- 54EABEB01940453C00F70476 /* codec_unittestTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = codec_unittestTests.m; sourceTree = "<group>"; };/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -72,16 +52,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 54EABEA01940453C00F70476 /* Frameworks */ = {- isa = PBXFrameworksBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 54EABEA51940453C00F70476 /* XCTest.framework in Frameworks */,
- 54EABEA71940453C00F70476 /* UIKit.framework in Frameworks */,
- 54EABEA61940453C00F70476 /* Foundation.framework in Frameworks */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@@ -89,7 +59,6 @@
isa = PBXGroup;
children = (
54EABE8B1940453B00F70476 /* codec_unittest */,
- 54EABEAA1940453C00F70476 /* codec_unittestTests */,
54EABE841940453B00F70476 /* Frameworks */,
54EABE831940453B00F70476 /* Products */,
);
@@ -99,7 +68,6 @@
isa = PBXGroup;
children = (
54EABE821940453B00F70476 /* codec_unittest.app */,
- 54EABEA31940453C00F70476 /* codec_unittestTests.xctest */,
);
name = Products;
sourceTree = "<group>";
@@ -112,7 +80,6 @@
54EABE851940453B00F70476 /* Foundation.framework */,
54EABE871940453B00F70476 /* CoreGraphics.framework */,
54EABE891940453B00F70476 /* UIKit.framework */,
- 54EABEA41940453C00F70476 /* XCTest.framework */,
);
name = Frameworks;
sourceTree = "<group>";
@@ -142,24 +109,6 @@
name = "Supporting Files";
sourceTree = "<group>";
};
- 54EABEAA1940453C00F70476 /* codec_unittestTests */ = {- isa = PBXGroup;
- children = (
- 54EABEB01940453C00F70476 /* codec_unittestTests.m */,
- 54EABEAB1940453C00F70476 /* Supporting Files */,
- );
- path = codec_unittestTests;
- sourceTree = "<group>";
- };
- 54EABEAB1940453C00F70476 /* Supporting Files */ = {- isa = PBXGroup;
- children = (
- 54EABEAC1940453C00F70476 /* codec_unittestTests-Info.plist */,
- 54EABEAD1940453C00F70476 /* InfoPlist.strings */,
- );
- name = "Supporting Files";
- sourceTree = "<group>";
- };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -180,24 +129,6 @@
productReference = 54EABE821940453B00F70476 /* codec_unittest.app */;
productType = "com.apple.product-type.application";
};
- 54EABEA21940453C00F70476 /* codec_unittestTests */ = {- isa = PBXNativeTarget;
- buildConfigurationList = 54EABEB71940453C00F70476 /* Build configuration list for PBXNativeTarget "codec_unittestTests" */;
- buildPhases = (
- 54EABE9F1940453C00F70476 /* Sources */,
- 54EABEA01940453C00F70476 /* Frameworks */,
- 54EABEA11940453C00F70476 /* Resources */,
- );
- buildRules = (
- );
- dependencies = (
- 54EABEA91940453C00F70476 /* PBXTargetDependency */,
- );
- name = codec_unittestTests;
- productName = codec_unittestTests;
- productReference = 54EABEA31940453C00F70476 /* codec_unittestTests.xctest */;
- productType = "com.apple.product-type.bundle.unit-test";
- };
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@@ -206,11 +137,6 @@
attributes = {LastUpgradeCheck = 0500;
ORGANIZATIONNAME = com.cisco;
- TargetAttributes = {- 54EABEA21940453C00F70476 = {- TestTargetID = 54EABE811940453B00F70476;
- };
- };
};
buildConfigurationList = 54EABE7D1940453B00F70476 /* Build configuration list for PBXProject "codec_unittest" */;
compatibilityVersion = "Xcode 3.2";
@@ -226,7 +152,6 @@
projectRoot = "";
targets = (
54EABE811940453B00F70476 /* codec_unittest */,
- 54EABEA21940453C00F70476 /* codec_unittestTests */,
);
};
/* End PBXProject section */
@@ -242,14 +167,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 54EABEA11940453C00F70476 /* Resources */ = {- isa = PBXResourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 54EABEAF1940453C00F70476 /* InfoPlist.strings in Resources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
@@ -263,24 +180,8 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
- 54EABE9F1940453C00F70476 /* Sources */ = {- isa = PBXSourcesBuildPhase;
- buildActionMask = 2147483647;
- files = (
- 54EABEB11940453C00F70476 /* codec_unittestTests.m in Sources */,
- );
- runOnlyForDeploymentPostprocessing = 0;
- };
/* End PBXSourcesBuildPhase section */
-/* Begin PBXTargetDependency section */
- 54EABEA91940453C00F70476 /* PBXTargetDependency */ = {- isa = PBXTargetDependency;
- target = 54EABE811940453B00F70476 /* codec_unittest */;
- targetProxy = 54EABEA81940453C00F70476 /* PBXContainerItemProxy */;
- };
-/* End PBXTargetDependency section */
-
/* Begin PBXVariantGroup section */
54EABE8E1940453B00F70476 /* InfoPlist.strings */ = {isa = PBXVariantGroup;
@@ -298,14 +199,6 @@
name = Main.storyboard;
sourceTree = "<group>";
};
- 54EABEAD1940453C00F70476 /* InfoPlist.strings */ = {- isa = PBXVariantGroup;
- children = (
- 54EABEAE1940453C00F70476 /* en */,
- );
- name = InfoPlist.strings;
- sourceTree = "<group>";
- };
/* End PBXVariantGroup section */
/* Begin XCBuildConfiguration section */
@@ -313,7 +206,7 @@
isa = XCBuildConfiguration;
buildSettings = {ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
@@ -352,7 +245,7 @@
isa = XCBuildConfiguration;
buildSettings = {ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
+ ARCHS = "$(ARCHS_STANDARD)";
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
CLANG_CXX_LIBRARY = "libc++";
CLANG_ENABLE_MODULES = YES;
@@ -395,11 +288,11 @@
INFOPLIST_FILE = "codec_unittest/codec_unittest-Info.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
- /Users/yongzxu/Desktop/openh264,
+ ../../../../,
);
OTHER_LDFLAGS = (
"-force_load",
- "$(BUILT_PRODUCTS_DIR)/libut.a",
+ ../../../../libut.a,
);
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
@@ -420,11 +313,11 @@
INFOPLIST_FILE = "codec_unittest/codec_unittest-Info.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
- /Users/yongzxu/Desktop/openh264,
+ ../../../../,
);
OTHER_LDFLAGS = (
"-force_load",
- "$(BUILT_PRODUCTS_DIR)/libut.a",
+ ../../../../libut.a,
);
PRODUCT_NAME = "$(TARGET_NAME)";
WRAPPER_EXTENSION = app;
@@ -431,48 +324,6 @@
};
name = Release;
};
- 54EABEB81940453C00F70476 /* Debug */ = {- isa = XCBuildConfiguration;
- buildSettings = {- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
- BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/codec_unittest.app/codec_unittest";
- FRAMEWORK_SEARCH_PATHS = (
- "$(SDKROOT)/Developer/Library/Frameworks",
- "$(inherited)",
- "$(DEVELOPER_FRAMEWORKS_DIR)",
- );
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "codec_unittest/codec_unittest-Prefix.pch";
- GCC_PREPROCESSOR_DEFINITIONS = (
- "DEBUG=1",
- "$(inherited)",
- );
- INFOPLIST_FILE = "codec_unittestTests/codec_unittestTests-Info.plist";
- PRODUCT_NAME = "$(TARGET_NAME)";
- TEST_HOST = "$(BUNDLE_LOADER)";
- WRAPPER_EXTENSION = xctest;
- };
- name = Debug;
- };
- 54EABEB91940453C00F70476 /* Release */ = {- isa = XCBuildConfiguration;
- buildSettings = {- ARCHS = "$(ARCHS_STANDARD_INCLUDING_64_BIT)";
- BUNDLE_LOADER = "$(BUILT_PRODUCTS_DIR)/codec_unittest.app/codec_unittest";
- FRAMEWORK_SEARCH_PATHS = (
- "$(SDKROOT)/Developer/Library/Frameworks",
- "$(inherited)",
- "$(DEVELOPER_FRAMEWORKS_DIR)",
- );
- GCC_PRECOMPILE_PREFIX_HEADER = YES;
- GCC_PREFIX_HEADER = "codec_unittest/codec_unittest-Prefix.pch";
- INFOPLIST_FILE = "codec_unittestTests/codec_unittestTests-Info.plist";
- PRODUCT_NAME = "$(TARGET_NAME)";
- TEST_HOST = "$(BUNDLE_LOADER)";
- WRAPPER_EXTENSION = xctest;
- };
- name = Release;
- };
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@@ -490,15 +341,6 @@
buildConfigurations = (
54EABEB51940453C00F70476 /* Debug */,
54EABEB61940453C00F70476 /* Release */,
- );
- defaultConfigurationIsVisible = 0;
- defaultConfigurationName = Release;
- };
- 54EABEB71940453C00F70476 /* Build configuration list for PBXNativeTarget "codec_unittestTests" */ = {- isa = XCConfigurationList;
- buildConfigurations = (
- 54EABEB81940453C00F70476 /* Debug */,
- 54EABEB91940453C00F70476 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;