Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Support for armv7s #827

Closed
wants to merge 2 commits into from

3 participants

@gherlein

Modified to support iOS 4.2 and later and armv7/armv7s - deprecating old armv6 which applies only to iPhone 3G and older devices

@jstart

+1

@jamesgpearce

Facebook has not maintained or supported Three20 for some time, and we are closing its old and outstanding pull requests.

Many, many thanks for your support of the project. If you have any further questions, please don't hesitate to let me know.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Nov 27, 2012
  1. @gherlein

    updated for armv7 and armv7s

    gherlein authored
  2. @gherlein

    Merge pull request #1 from racker/armv7-update

    gherlein authored
    updated for armv7 and armv7s
This page is out of date. Refresh to see the latest.
View
6 src/Three20/Three20.xcodeproj/project.pbxproj
@@ -721,9 +721,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6E64543D1184BE1B00F08CB1 /* Project.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
};
@@ -790,9 +792,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6E64543D1184BE1B00F08CB1 /* Project.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
};
@@ -802,9 +806,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6E64543D1184BE1B00F08CB1 /* Project.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
};
View
6 src/Three20Core/Three20Core.xcodeproj/project.pbxproj
@@ -548,12 +548,14 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6E55A4B31183CA80002768DE /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
};
@@ -577,10 +579,12 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6E55A4B31183CA80002768DE /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
};
name = Debug;
@@ -589,8 +593,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6E55A4B31183CA80002768DE /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
ZERO_LINK = NO;
};
View
6 src/Three20Network/Three20Network.xcodeproj/project.pbxproj
@@ -580,10 +580,12 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EE7364B11849B3D00A35176 /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
};
@@ -607,10 +609,12 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EE7364B11849B3D00A35176 /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
};
name = Debug;
@@ -619,8 +623,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EE7364B11849B3D00A35176 /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
ZERO_LINK = NO;
};
View
6 src/Three20Style/Three20Style.xcodeproj/project.pbxproj
@@ -1099,12 +1099,14 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EE7364B11849B3D00A35176 /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
};
@@ -1135,10 +1137,12 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EE7364B11849B3D00A35176 /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
};
name = Debug;
@@ -1147,8 +1151,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EE7364B11849B3D00A35176 /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
ZERO_LINK = NO;
};
View
2  src/Three20UI/Sources/UIViewAdditions.m
@@ -27,7 +27,7 @@
// Remove GSEvent and UITouchAdditions from Release builds
-#ifdef DEBUG
+#ifdef DEBUG_TOUCHES
///////////////////////////////////////////////////////////////////////////////////////////////////
///////////////////////////////////////////////////////////////////////////////////////////////////
View
6 src/Three20UI/Three20UI.xcodeproj/project.pbxproj
@@ -2344,12 +2344,14 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EE7364B11849B3D00A35176 /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
};
@@ -2375,10 +2377,12 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EE7364B11849B3D00A35176 /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
};
name = Debug;
@@ -2387,8 +2391,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EE7364B11849B3D00A35176 /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
ZERO_LINK = NO;
};
View
6 src/Three20UICommon/Three20UICommon.xcodeproj/project.pbxproj
@@ -446,9 +446,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6E64543D1184BE1B00F08CB1 /* Project.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
};
@@ -512,9 +514,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6E64543D1184BE1B00F08CB1 /* Project.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
};
@@ -524,9 +528,11 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6E64543D1184BE1B00F08CB1 /* Project.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
};
View
6 src/Three20UINavigator/Three20UINavigator.xcodeproj/project.pbxproj
@@ -705,12 +705,14 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EE7364B11849B3D00A35176 /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
GCC_PREFIX_HEADER = "";
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
RUN_CLANG_STATIC_ANALYZER = YES;
SDKROOT = iphoneos;
};
@@ -736,10 +738,12 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EE7364B11849B3D00A35176 /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
};
name = Debug;
@@ -748,8 +752,10 @@
isa = XCBuildConfiguration;
baseConfigurationReference = 6EE7364B11849B3D00A35176 /* Library.xcconfig */;
buildSettings = {
+ "ARCHS[sdk=iphoneos*]" = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
ZERO_LINK = NO;
};
View
6 src/common/Configurations/Library.xcconfig
@@ -34,11 +34,11 @@ SKIP_INSTALL = YES
//WARNING_CFLAGS = -Wno-unused-value
FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)/Developer/Library/Frameworks"
-IPHONEOS_DEPLOYMENT_TARGET = 3.0
+IPHONEOS_DEPLOYMENT_TARGET = 4.2
SDKROOT = iphoneos
// Required for older iOS devices (iPhone 3G)
ARCHS = $(ARCHS_STANDARD_32_BIT)
-ARCHS[sdk=iphoneos*] = armv6 armv7
+ARCHS[sdk=iphoneos*] = armv7 armv7s
// Linker Flags
@@ -55,4 +55,4 @@ GCC_WARN_UNUSED_LABEL = YES
// THIS APPARENTLY FIXES HORRIBLE PROBLEMS WITH THE OPTIMIZER
// ACCESSING BASIC PROPS IN UI
-OTHER_CFLAGS[arch=armv6] = -mno-thumb
+//OTHER_CFLAGS[arch=armv6] = -mno-thumb
View
4 src/common/Configurations/Project.xcconfig
@@ -17,8 +17,8 @@
#include "Paths.xcconfig"
FRAMEWORK_SEARCH_PATHS = "$(SDKROOT)/Developer/Library/Frameworks"
-IPHONEOS_DEPLOYMENT_TARGET = 3.0
+IPHONEOS_DEPLOYMENT_TARGET = 4.2
SDKROOT = iphoneos
// Required for older iOS devices (iPhone 3G)
ARCHS = $(ARCHS_STANDARD_32_BIT)
-ARCHS[sdk=iphoneos*] = armv6 armv7
+ARCHS[sdk=iphoneos*] = armv7 armv7s
Something went wrong with that request. Please try again.