couple more iOS 6 tweaks: missing build archs and no rotatation in th…

…e sample apps git-svn-id: http://zxing.googlecode.com/svn/trunk@2458 59b500cc-1b3d-0410-9834-0bbf25fbcc57
greedychipmunk · Oct 16, 2012 · 3254cee · 3254cee
1 parent 8bbf505
commit 3254cee
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 1 deletion.
diff --git a/cpp/.gitignore b/cpp/.gitignore
@@ -1,4 +1,5 @@
 /build
 /.sconsign.dblite
 xcuserdata
-callgrind.out.*
+callgrind.out.*
+contents.xcworkspacedata
diff --git a/iphone/.gitignore b/iphone/.gitignore
@@ -0,0 +1 @@
+contents.xcworkspacedata
diff --git a/iphone/Barcodes/Barcodes-Info.plist b/iphone/Barcodes/Barcodes-Info.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleDisplayName</key>

diff --git a/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj b/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj
@@ -560,6 +560,11 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					i386,
+					armv7s,
+					armv7,
+				);
 				COPY_PHASE_STRIP = NO;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_OPTIMIZATION_LEVEL = 0;
@@ -572,13 +577,19 @@
 					"-Objc",
 				);
 				PRODUCT_NAME = Barcodes;
+				VALID_ARCHS = "armv7 armv7s";
 			};
 			name = Debug;
 		};
 		1D6058950D05DD3E006BFB54 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					i386,
+					armv7s,
+					armv7,
+				);
 				CODE_SIGN_IDENTITY = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
@@ -592,6 +603,7 @@
 				PRODUCT_NAME = Barcodes;
 				PROVISIONING_PROFILE = "";
 				VALIDATE_PRODUCT = YES;
+				VALID_ARCHS = "armv7 armv7s";
 			};
 			name = Release;
 		};
@@ -631,6 +643,11 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = (
+					i386,
+					armv7s,
+					armv7,
+				);
 				COPY_PHASE_STRIP = YES;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = Barcodes_Prefix.pch;
@@ -642,6 +659,7 @@
 				);
 				PRODUCT_NAME = Barcodes;
 				VALIDATE_PRODUCT = YES;
+				VALID_ARCHS = "armv7 armv7s";
 			};
 			name = Distribution;
 		};

diff --git a/iphone/ScanTest/ScanTest-Info.plist b/iphone/ScanTest/ScanTest-Info.plist
@@ -2,6 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+	</array>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>English</string>
 	<key>CFBundleDisplayName</key>

diff --git a/objc/.gitignore b/objc/.gitignore
@@ -5,3 +5,4 @@
 /ios.xcodeproj/*.pbxuser
 /ios.xcodeproj/*.mode1v3
 xcuserdata
+contents.xcworkspacedata