diff --git a/cpp/.gitignore b/cpp/.gitignore index 589a7ab72..61ad0ccbb 100644 --- a/cpp/.gitignore +++ b/cpp/.gitignore @@ -1,4 +1,5 @@ /build /.sconsign.dblite xcuserdata -callgrind.out.* \ No newline at end of file +callgrind.out.* +contents.xcworkspacedata \ No newline at end of file diff --git a/iphone/.gitignore b/iphone/.gitignore new file mode 100644 index 000000000..0a9456fae --- /dev/null +++ b/iphone/.gitignore @@ -0,0 +1 @@ +contents.xcworkspacedata \ No newline at end of file diff --git a/iphone/Barcodes/Barcodes-Info.plist b/iphone/Barcodes/Barcodes-Info.plist index 5d32856a5..ba1ddcced 100644 --- a/iphone/Barcodes/Barcodes-Info.plist +++ b/iphone/Barcodes/Barcodes-Info.plist @@ -2,6 +2,10 @@ + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + CFBundleDevelopmentRegion English CFBundleDisplayName diff --git a/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj b/iphone/Barcodes/Barcodes.xcodeproj/project.pbxproj index 6dbd40ce3..77bfd9123 100755 --- 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,6 +577,7 @@ "-Objc", ); PRODUCT_NAME = Barcodes; + VALID_ARCHS = "armv7 armv7s"; }; name = Debug; }; @@ -579,6 +585,11 @@ 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 index 2983a4b5a..a50990275 100644 --- a/iphone/ScanTest/ScanTest-Info.plist +++ b/iphone/ScanTest/ScanTest-Info.plist @@ -2,6 +2,10 @@ + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + CFBundleDevelopmentRegion English CFBundleDisplayName diff --git a/objc/.gitignore b/objc/.gitignore index 6175395f6..52e2f9203 100644 --- a/objc/.gitignore +++ b/objc/.gitignore @@ -5,3 +5,4 @@ /ios.xcodeproj/*.pbxuser /ios.xcodeproj/*.mode1v3 xcuserdata +contents.xcworkspacedata \ No newline at end of file