mirror of
https://github.com/zxing/zxing.git
synced 2025-01-12 19:57:27 -08:00
couple more iOS 6 tweaks: missing build archs and no rotatation in the sample apps
git-svn-id: https://zxing.googlecode.com/svn/trunk@2458 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
parent
d4ab50929f
commit
4c57b3673c
1
cpp/.gitignore
vendored
1
cpp/.gitignore
vendored
|
@ -2,3 +2,4 @@
|
||||||
/.sconsign.dblite
|
/.sconsign.dblite
|
||||||
xcuserdata
|
xcuserdata
|
||||||
callgrind.out.*
|
callgrind.out.*
|
||||||
|
contents.xcworkspacedata
|
1
iphone/.gitignore
vendored
Normal file
1
iphone/.gitignore
vendored
Normal file
|
@ -0,0 +1 @@
|
||||||
|
contents.xcworkspacedata
|
|
@ -2,6 +2,10 @@
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
<plist version="1.0">
|
<plist version="1.0">
|
||||||
<dict>
|
<dict>
|
||||||
|
<key>UISupportedInterfaceOrientations</key>
|
||||||
|
<array>
|
||||||
|
<string>UIInterfaceOrientationPortrait</string>
|
||||||
|
</array>
|
||||||
<key>CFBundleDevelopmentRegion</key>
|
<key>CFBundleDevelopmentRegion</key>
|
||||||
<string>English</string>
|
<string>English</string>
|
||||||
<key>CFBundleDisplayName</key>
|
<key>CFBundleDisplayName</key>
|
||||||
|
|
|
@ -560,6 +560,11 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
|
ARCHS = (
|
||||||
|
i386,
|
||||||
|
armv7s,
|
||||||
|
armv7,
|
||||||
|
);
|
||||||
COPY_PHASE_STRIP = NO;
|
COPY_PHASE_STRIP = NO;
|
||||||
GCC_DYNAMIC_NO_PIC = NO;
|
GCC_DYNAMIC_NO_PIC = NO;
|
||||||
GCC_OPTIMIZATION_LEVEL = 0;
|
GCC_OPTIMIZATION_LEVEL = 0;
|
||||||
|
@ -572,6 +577,7 @@
|
||||||
"-Objc",
|
"-Objc",
|
||||||
);
|
);
|
||||||
PRODUCT_NAME = Barcodes;
|
PRODUCT_NAME = Barcodes;
|
||||||
|
VALID_ARCHS = "armv7 armv7s";
|
||||||
};
|
};
|
||||||
name = Debug;
|
name = Debug;
|
||||||
};
|
};
|
||||||
|
@ -579,6 +585,11 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
|
ARCHS = (
|
||||||
|
i386,
|
||||||
|
armv7s,
|
||||||
|
armv7,
|
||||||
|
);
|
||||||
CODE_SIGN_IDENTITY = "iPhone Developer";
|
CODE_SIGN_IDENTITY = "iPhone Developer";
|
||||||
COPY_PHASE_STRIP = YES;
|
COPY_PHASE_STRIP = YES;
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||||
|
@ -592,6 +603,7 @@
|
||||||
PRODUCT_NAME = Barcodes;
|
PRODUCT_NAME = Barcodes;
|
||||||
PROVISIONING_PROFILE = "";
|
PROVISIONING_PROFILE = "";
|
||||||
VALIDATE_PRODUCT = YES;
|
VALIDATE_PRODUCT = YES;
|
||||||
|
VALID_ARCHS = "armv7 armv7s";
|
||||||
};
|
};
|
||||||
name = Release;
|
name = Release;
|
||||||
};
|
};
|
||||||
|
@ -631,6 +643,11 @@
|
||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_SEARCH_USER_PATHS = NO;
|
ALWAYS_SEARCH_USER_PATHS = NO;
|
||||||
|
ARCHS = (
|
||||||
|
i386,
|
||||||
|
armv7s,
|
||||||
|
armv7,
|
||||||
|
);
|
||||||
COPY_PHASE_STRIP = YES;
|
COPY_PHASE_STRIP = YES;
|
||||||
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
GCC_PRECOMPILE_PREFIX_HEADER = YES;
|
||||||
GCC_PREFIX_HEADER = Barcodes_Prefix.pch;
|
GCC_PREFIX_HEADER = Barcodes_Prefix.pch;
|
||||||
|
@ -642,6 +659,7 @@
|
||||||
);
|
);
|
||||||
PRODUCT_NAME = Barcodes;
|
PRODUCT_NAME = Barcodes;
|
||||||
VALIDATE_PRODUCT = YES;
|
VALIDATE_PRODUCT = YES;
|
||||||
|
VALID_ARCHS = "armv7 armv7s";
|
||||||
};
|
};
|
||||||
name = Distribution;
|
name = Distribution;
|
||||||
};
|
};
|
||||||
|
|
|
@ -2,6 +2,10 @@
|
||||||
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
<plist version="1.0">
|
<plist version="1.0">
|
||||||
<dict>
|
<dict>
|
||||||
|
<key>UISupportedInterfaceOrientations</key>
|
||||||
|
<array>
|
||||||
|
<string>UIInterfaceOrientationPortrait</string>
|
||||||
|
</array>
|
||||||
<key>CFBundleDevelopmentRegion</key>
|
<key>CFBundleDevelopmentRegion</key>
|
||||||
<string>English</string>
|
<string>English</string>
|
||||||
<key>CFBundleDisplayName</key>
|
<key>CFBundleDisplayName</key>
|
||||||
|
|
1
objc/.gitignore
vendored
1
objc/.gitignore
vendored
|
@ -5,3 +5,4 @@
|
||||||
/ios.xcodeproj/*.pbxuser
|
/ios.xcodeproj/*.pbxuser
|
||||||
/ios.xcodeproj/*.mode1v3
|
/ios.xcodeproj/*.mode1v3
|
||||||
xcuserdata
|
xcuserdata
|
||||||
|
contents.xcworkspacedata
|
Loading…
Reference in a new issue