mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2024-09-20 05:27:32 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Xcode 4.5.1 project updates

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2455 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2012-10-13 23:39:06 +00:00
parent 91a71dba0b
commit 1f0ac619b0
5 changed files with 58 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
cpp/zxing-cpp.xcodeproj/project.pbxproj
View file

@ -977,8 +977,8 @@
ARCHS = (
x86_64,
i386,
armv7s,
armv7,
armv6,
);
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@ -996,10 +996,13 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = core/src;
IPHONEOS_DEPLOYMENT_TARGET = 4.2;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
VALID_ARCHS = "armv6 armv7 x86_64 i386";
VALID_ARCHS = "armv7 armv7s i386 x86_64";
"VALID_ARCHS[sdk=iphoneos*]" = "armv7 armv7s";
"VALID_ARCHS[sdk=iphonesimulator*]" = i386;
"VALID_ARCHS[sdk=macosx*]" = "i386 x86_64";
WARNING_CFLAGS = "-Wall";
};
name = Debug;
@ -1011,8 +1014,8 @@
ARCHS = (
x86_64,
i386,
armv7s,
armv7,
armv6,
);
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
@ -1023,11 +1026,14 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = core/src;
IPHONEOS_DEPLOYMENT_TARGET = 4.2;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "armv6 armv7 x86_64 i386";
VALID_ARCHS = "armv7 armv7s i386 x86_64";
"VALID_ARCHS[sdk=iphoneos*]" = "armv7 armv7s";
"VALID_ARCHS[sdk=iphonesimulator*]" = i386;
"VALID_ARCHS[sdk=macosx*]" = "i386 x86_64";
WARNING_CFLAGS = "-Wall";
};
name = Release;
@ -1035,12 +1041,7 @@
3B83E99C158E66C600A3B31F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALTERNATE_PERMISSIONS_FILES = (
armv6,
armv7,
i386,
x86_64,
);
ALTERNATE_PERMISSIONS_FILES = "";
DSTROOT = /tmp/zxing_cpp.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "";
@ -1048,20 +1049,13 @@
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
"VALID_ARCHS[sdk=iphoneos*]" = "armv6 armv7";
"VALID_ARCHS[sdk=macosx*]" = "x86_64 i386";
};
name = Debug;
};
3B83E99D158E66C600A3B31F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALTERNATE_PERMISSIONS_FILES = (
armv6,
armv7,
i386,
x86_64,
);
ALTERNATE_PERMISSIONS_FILES = "";
DSTROOT = /tmp/zxing_cpp.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "";
@ -1069,8 +1063,6 @@
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = "$(TARGET_NAME)";
SKIP_INSTALL = YES;
"VALID_ARCHS[sdk=iphoneos*]" = "armv6 armv7";
"VALID_ARCHS[sdk=macosx*]" = "x86_64 i386";
};
name = Release;
};

12
iphone/ScanTest/ScanTest.xcodeproj/project.pbxproj
View file

@ -328,9 +328,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
i386,
armv7,
armv6,
armv7s,
);
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
@ -343,9 +342,10 @@
../../cpp/core/src,
"../ZXingWidget/Classes/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
VALID_ARCHS = "armv7 armv7s";
WARNING_CFLAGS = (
"-Werror",
"-Wall",
@ -359,9 +359,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
i386,
armv7,
armv6,
armv7s,
);
CODE_SIGN_IDENTITY = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
@ -373,10 +372,11 @@
../../cpp/core/src,
"../ZXingWidget/Classes/**",
);
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PROVISIONING_PROFILE = "";
SDKROOT = iphoneos;
VALID_ARCHS = "armv7 armv7s";
WARNING_CFLAGS = (
"-Werror",
"-Wall",

14
iphone/ZXingWidget/ZXingWidget.xcodeproj/project.pbxproj
View file

@ -1576,9 +1576,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
i386,
armv6,
armv7,
armv7s,
);
GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = 0;
@ -1588,10 +1587,10 @@
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ../../cpp/core/src;
"HEADER_SEARCH_PATHS[arch=*]" = "";
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
VALID_ARCHS = "armv7 armv6 i386";
VALID_ARCHS = "armv7 armv7s";
WARNING_CFLAGS = (
"-Wall",
"-Wextra",
@ -1605,9 +1604,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
i386,
armv6,
armv7,
armv7s,
);
GCC_C_LANGUAGE_STANDARD = c99;
"GCC_THUMB_SUPPORT[arch=armv6]" = NO;
@ -1615,10 +1613,10 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ../../cpp/core/src;
IPHONEOS_DEPLOYMENT_TARGET = 4.0;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_LDFLAGS = "-ObjC";
SDKROOT = iphoneos;
VALID_ARCHS = "armv7 armv6 i386";
VALID_ARCHS = "armv7 armv7s";
WARNING_CFLAGS = (
"-Wall",
"-Wextra",

20
objc/examples/ios/bare/bare.xcodeproj/project.pbxproj
View file

@ -7,7 +7,6 @@
objects = {
/* Begin PBXBuildFile section */
3B1C7FA3159168AF0074F246 /* libzxing-objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA9968315913CE50056A230 /* libzxing-objc.a */; };
3BA99657159122210056A230 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA99656159122210056A230 /* UIKit.framework */; };
3BA99659159122210056A230 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA99658159122210056A230 /* Foundation.framework */; };
3BA9965B159122210056A230 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA9965A159122210056A230 /* CoreGraphics.framework */; };
@ -22,6 +21,8 @@
3BA9969415913DCE0056A230 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA9969315913DCE0056A230 /* libiconv.dylib */; };
3BA9969615913DFB0056A230 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA9969515913DFB0056A230 /* CoreMedia.framework */; };
3BA996C5159165330056A230 /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 3BA996C4159165330056A230 /* main.mm */; };
3BBC20A5161BCA03002885A0 /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 3BBC20A4161BCA03002885A0 /* Default-568h@2x.png */; };
3BF2C0BF161BD54700DA3C5C /* libzxing-objc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3BA9968315913CE50056A230 /* libzxing-objc.a */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@ -69,6 +70,7 @@
3BA9969315913DCE0056A230 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
3BA9969515913DFB0056A230 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
3BA996C4159165330056A230 /* main.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = main.mm; sourceTree = "<group>"; };
3BBC20A4161BCA03002885A0 /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -76,7 +78,7 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
3B1C7FA3159168AF0074F246 /* libzxing-objc.a in Frameworks */,
3BF2C0BF161BD54700DA3C5C /* libzxing-objc.a in Frameworks */,
3BA9969615913DFB0056A230 /* CoreMedia.framework in Frameworks */,
3BA9969415913DCE0056A230 /* libiconv.dylib in Frameworks */,
3BA9969015913D730056A230 /* QuartzCore.framework in Frameworks */,
@ -94,6 +96,7 @@
3BA99647159122210056A230 = {
isa = PBXGroup;
children = (
3BBC20A4161BCA03002885A0 /* Default-568h@2x.png */,
3BA9967615913CE40056A230 /* zxing-objc.xcodeproj */,
3BA9965C159122210056A230 /* bare */,
3BA99655159122210056A230 /* Frameworks */,
@ -235,6 +238,7 @@
3BA99661159122210056A230 /* InfoPlist.strings in Resources */,
3BA9966D159122210056A230 /* ViewController_iPhone.xib in Resources */,
3BA99670159122210056A230 /* ViewController_iPad.xib in Resources */,
3BBC20A5161BCA03002885A0 /* Default-568h@2x.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@ -295,7 +299,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
armv7,
armv6,
armv7s,
);
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
@ -313,9 +317,10 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.2;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALID_ARCHS = "armv7 armv7s";
WARNING_CFLAGS = "-Wall";
};
name = Debug;
@ -326,7 +331,7 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = (
armv7,
armv6,
armv7s,
);
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
@ -337,11 +342,12 @@
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 4.2;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
SDKROOT = iphoneos;
TARGETED_DEVICE_FAMILY = "1,2";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "armv7 armv7s";
WARNING_CFLAGS = "-Wall";
};
name = Release;
@ -363,7 +369,6 @@
"\"$(SRCROOT)/../../../../../../Library/Developer/Xcode/DerivedData/bare-ceenmvkaxbzcsubayrtaunypjmgx/Build/Products/Debug-iphoneos\"",
);
PRODUCT_NAME = "$(TARGET_NAME)";
VALID_ARCHS = "armv7 armv6";
WRAPPER_EXTENSION = app;
};
name = Debug;
@ -385,7 +390,6 @@
"\"$(SRCROOT)/../../../../../../Library/Developer/Xcode/DerivedData/bare-ceenmvkaxbzcsubayrtaunypjmgx/Build/Products/Debug-iphoneos\"",
);
PRODUCT_NAME = "$(TARGET_NAME)";
VALID_ARCHS = "armv7 armv6";
WRAPPER_EXTENSION = app;
};
name = Release;

40
objc/zxing-objc.xcodeproj/project.pbxproj
View file

@ -504,7 +504,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS = (
i386,
armv7s,
armv7,
x86_64,
);
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
@ -525,11 +530,12 @@
../cpp/core/src,
);
INSTALL_PATH = "@executable_path/../Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
VALID_ARCHS = "armv6 armv7 x86_64 i386";
"VALID_ARCHS[sdk=iphoneos*]" = "armv6 armv7";
VALID_ARCHS = "armv7 armv7s x86_64 i386";
"VALID_ARCHS[sdk=iphoneos*]" = "armv7 armv7s";
"VALID_ARCHS[sdk=iphonesimulator*]" = i386;
"VALID_ARCHS[sdk=macosx*]" = "x86_64 i386";
WARNING_CFLAGS = "-Wall";
};
@ -539,7 +545,12 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_32_BIT)";
ARCHS = (
i386,
armv7s,
armv7,
x86_64,
);
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
GCC_C_LANGUAGE_STANDARD = gnu99;
@ -553,12 +564,13 @@
../cpp/core/src,
);
INSTALL_PATH = "@executable_path/../Frameworks";
IPHONEOS_DEPLOYMENT_TARGET = 5.1;
IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
VALIDATE_PRODUCT = YES;
VALID_ARCHS = "armv6 armv7 x86_64 i386";
"VALID_ARCHS[sdk=iphoneos*]" = "armv6 armv7";
VALID_ARCHS = "";
"VALID_ARCHS[sdk=iphoneos*]" = "armv7 armv7s";
"VALID_ARCHS[sdk=iphonesimulator*]" = i386;
"VALID_ARCHS[sdk=macosx*]" = "x86_64 i386";
WARNING_CFLAGS = "-Wall";
};
@ -567,12 +579,6 @@
3B83EB33158E6C5100A3B31F /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
x86_64,
i386,
armv7,
armv6,
);
DSTROOT = /tmp/zxing_objc.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = src/Prefix.pch;
@ -586,12 +592,6 @@
3B83EB34158E6C5100A3B31F /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ARCHS = (
x86_64,
i386,
armv7,
armv6,
);
DSTROOT = /tmp/zxing_objc.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = src/Prefix.pch;