X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=iphone%2FZXing.xcodeproj%2Fproject.pbxproj;h=c6453cdfa7802817058ee4f91191355dfb94da6c;hb=b134cc06d5fa3035636905325ef863502535f4aa;hp=1135cc802fd8c46bb21c6fb2c13a3a6415c6c647;hpb=515b863a72ae335657c3cd3f069f5c51ee1cf1cf;p=zxing.git diff --git a/iphone/ZXing.xcodeproj/project.pbxproj b/iphone/ZXing.xcodeproj/project.pbxproj index 1135cc80..c6453cdf 100755 --- a/iphone/ZXing.xcodeproj/project.pbxproj +++ b/iphone/ZXing.xcodeproj/project.pbxproj @@ -90,7 +90,7 @@ 853678830E5394D70054126A /* About.html in Resources */ = {isa = PBXBuildFile; fileRef = 853678820E5394D70054126A /* About.html */; }; 854BE3010E06A56C00CB4A20 /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 854BE3000E06A56C00CB4A20 /* AddressBookUI.framework */; }; 8555304E0E643BA800C7B5DE /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8555304D0E643BA800C7B5DE /* Entitlements.plist */; }; - 8555307B0E64504300C7B5DE /* zxing-57.png in Resources */ = {isa = PBXBuildFile; fileRef = 8555307A0E64504300C7B5DE /* zxing-57.png */; }; + 8555307B0E64504300C7B5DE /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 8555307A0E64504300C7B5DE /* icon.png */; }; 855A66800DF5E757007B394F /* ArchiveController.m in Sources */ = {isa = PBXBuildFile; fileRef = 855A66510DF5E757007B394F /* ArchiveController.m */; }; 855A66810DF5E757007B394F /* Database.m in Sources */ = {isa = PBXBuildFile; fileRef = 855A66540DF5E757007B394F /* Database.m */; }; 855A66830DF5E757007B394F /* AddContactAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 855A66580DF5E757007B394F /* AddContactAction.m */; }; @@ -206,12 +206,9 @@ 85C3CC3B0E119E1700A01C6A /* sms.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C3CC330E119E1700A01C6A /* sms.png */; }; 85C3CC3C0E119E1700A01C6A /* text.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C3CC340E119E1700A01C6A /* text.png */; }; 85C4969C0E4A3E87003DB029 /* filmroll-2.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C4969B0E4A3E87003DB029 /* filmroll-2.png */; }; - 85CC331E0E583DDB0053F819 /* OneDReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 85CC33140E574B1B0053F819 /* OneDReader.h */; }; - 85CC33200E583DEB0053F819 /* OneDReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85CC33150E574B1B0053F819 /* OneDReader.cpp */; }; - 85CC33420E5861DD0053F819 /* AbstractOneDReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 85CC33400E5861DD0053F819 /* AbstractOneDReader.h */; }; - 85CC33430E5861DD0053F819 /* AbstractOneDReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 85CC33410E5861DD0053F819 /* AbstractOneDReader.cpp */; }; 85D937270E11064700B785E0 /* ScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 85D937260E11064700B785E0 /* ScanViewController.m */; }; 85E883980E1A34D2004C4547 /* ScannedImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 85E883970E1A34D2004C4547 /* ScannedImageView.m */; }; + 85E945270E9410EF0052CC40 /* ZxingLarge.png in Resources */ = {isa = PBXBuildFile; fileRef = 85E945260E9410EF0052CC40 /* ZxingLarge.png */; }; 85F895030E543EE100C0A666 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 85F895020E543EE100C0A666 /* InfoPlist.strings */; }; /* End PBXBuildFile section */ @@ -313,7 +310,7 @@ 8539502C0E5442B500D081D6 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/InfoPlist.strings; sourceTree = ""; }; 854BE3000E06A56C00CB4A20 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; }; 8555304D0E643BA800C7B5DE /* Entitlements.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Entitlements.plist; sourceTree = ""; }; - 8555307A0E64504300C7B5DE /* zxing-57.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zxing-57.png"; sourceTree = ""; }; + 8555307A0E64504300C7B5DE /* icon.png */ = {isa = PBXFileReference; explicitFileType = image.png; path = icon.png; sourceTree = ""; }; 855A65D70DF5E739007B394F /* BarcodeFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BarcodeFormat.cpp; sourceTree = ""; }; 855A65D80DF5E739007B394F /* BarcodeFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BarcodeFormat.h; sourceTree = ""; }; 855A65D90DF5E739007B394F /* BlackPointEstimationMethod.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BlackPointEstimationMethod.cpp; sourceTree = ""; }; @@ -649,14 +646,11 @@ 85C3CC330E119E1700A01C6A /* sms.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sms.png; sourceTree = ""; }; 85C3CC340E119E1700A01C6A /* text.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text.png; sourceTree = ""; }; 85C4969B0E4A3E87003DB029 /* filmroll-2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "filmroll-2.png"; sourceTree = ""; }; - 85CC33140E574B1B0053F819 /* OneDReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OneDReader.h; sourceTree = ""; }; - 85CC33150E574B1B0053F819 /* OneDReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = OneDReader.cpp; sourceTree = ""; }; - 85CC33400E5861DD0053F819 /* AbstractOneDReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AbstractOneDReader.h; sourceTree = ""; }; - 85CC33410E5861DD0053F819 /* AbstractOneDReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AbstractOneDReader.cpp; sourceTree = ""; }; 85D937250E11064700B785E0 /* ScanViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScanViewController.h; sourceTree = ""; }; 85D937260E11064700B785E0 /* ScanViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScanViewController.m; sourceTree = ""; }; 85E883960E1A34D2004C4547 /* ScannedImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScannedImageView.h; sourceTree = ""; }; 85E883970E1A34D2004C4547 /* ScannedImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScannedImageView.m; sourceTree = ""; }; + 85E945260E9410EF0052CC40 /* ZxingLarge.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = ZxingLarge.png; sourceTree = ""; }; 85F7D20E0E41D4A700FDC34E /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/Message.xib; sourceTree = ""; }; 85F7D20F0E41D4A700FDC34E /* de */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = de; path = de.lproj/Hints.html; sourceTree = ""; }; 85F7D2100E41D4B300FDC34E /* sv */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sv; path = sv.lproj/Message.xib; sourceTree = ""; }; @@ -780,6 +774,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 85E945260E9410EF0052CC40 /* ZxingLarge.png */, 85C37A3F0E4076BB0052209B /* Message.xib */, 85764F680E3E22FC00A61BF5 /* Hints.html */, 85B1D8840E190E3A00514A6A /* Default.png */, @@ -877,7 +872,6 @@ 855A65D60DF5E739007B394F /* CoreSrc */ = { isa = PBXGroup; children = ( - 85CC33130E574AD50053F819 /* oned */, 857D363F0DF60E37000E0C89 /* Exception.h */, 857D36400DF60E37000E0C89 /* Exception.cpp */, 851B4AA60DF631EB00C8958F /* TransformingMonochromeBitmapSource.h */, @@ -1384,7 +1378,7 @@ isa = PBXGroup; children = ( 85B8F52B0E6AD33200510402 /* photolib.png */, - 8555307A0E64504300C7B5DE /* zxing-57.png */, + 8555307A0E64504300C7B5DE /* icon.png */, 85C4969B0E4A3E87003DB029 /* filmroll-2.png */, 85C3CC2D0E119E1600A01C6A /* business-card.png */, 85C3CC2E0E119E1700A01C6A /* email.png */, @@ -1398,17 +1392,6 @@ name = Images; sourceTree = ""; }; - 85CC33130E574AD50053F819 /* oned */ = { - isa = PBXGroup; - children = ( - 85CC33400E5861DD0053F819 /* AbstractOneDReader.h */, - 85CC33410E5861DD0053F819 /* AbstractOneDReader.cpp */, - 85CC33140E574B1B0053F819 /* OneDReader.h */, - 85CC33150E574B1B0053F819 /* OneDReader.cpp */, - ); - path = oned; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -1416,8 +1399,6 @@ isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; files = ( - 85CC331E0E583DDB0053F819 /* OneDReader.h in Headers */, - 85CC33420E5861DD0053F819 /* AbstractOneDReader.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1558,8 +1539,9 @@ 853678830E5394D70054126A /* About.html in Resources */, 85F895030E543EE100C0A666 /* InfoPlist.strings in Resources */, 8555304E0E643BA800C7B5DE /* Entitlements.plist in Resources */, - 8555307B0E64504300C7B5DE /* zxing-57.png in Resources */, + 8555307B0E64504300C7B5DE /* icon.png in Resources */, 85B8F52C0E6AD33200510402 /* photolib.png in Resources */, + 85E945270E9410EF0052CC40 /* ZxingLarge.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1677,8 +1659,6 @@ 8514EB130DF88F0500EE78D3 /* ReaderException.cpp in Sources */, 8514EB140DF88F0500EE78D3 /* Result.cpp in Sources */, 8514EB150DF88F0500EE78D3 /* ResultPoint.cpp in Sources */, - 85CC33200E583DEB0053F819 /* OneDReader.cpp in Sources */, - 85CC33430E5861DD0053F819 /* AbstractOneDReader.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1881,13 +1861,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Christian Brunschen"; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ZXing_Prefix.pch; INFOPLIST_FILE = Info.plist; PRODUCT_NAME = Barcodes; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "6827259A-0073-4678-82F6-329E230F6801"; }; name = Release; }; @@ -1921,12 +1899,10 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Christian Brunschen"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "3A1B16DE-FE88-44B7-B4AD-D409BB8F7DDD"; SDKROOT = iphoneos2.0; }; name = "AdHoc Distribution"; @@ -1935,13 +1911,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CODE_SIGN_ENTITLEMENTS = Entitlements.plist; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ZXing_Prefix.pch; INFOPLIST_FILE = Info.plist; PRODUCT_NAME = Barcodes; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "6CDE626B-71E0-4E2A-BED0-DDE5BE24A701"; }; name = "AdHoc Distribution"; }; @@ -2127,13 +2101,11 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "F7E3CE9A-42BC-4860-A74F-B4D05A088442"; SDKROOT = macosx10.5; }; name = Test; @@ -2225,12 +2197,10 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Christian Brunschen"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "6CDE626B-71E0-4E2A-BED0-DDE5BE24A701"; SDKROOT = iphoneos2.0; }; name = Distribution; @@ -2239,13 +2209,11 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CODE_SIGN_ENTITLEMENTS = ""; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ZXing_Prefix.pch; INFOPLIST_FILE = Info.plist; PRODUCT_NAME = Barcodes; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "3A1B16DE-FE88-44B7-B4AD-D409BB8F7DDD"; }; name = Distribution; }; @@ -2321,13 +2289,11 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = YES; PREBINDING = NO; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = "F7E3CE9A-42BC-4860-A74F-B4D05A088442"; SDKROOT = iphoneos2.0; }; name = Debug; @@ -2336,12 +2302,10 @@ isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - "PROVISIONING_PROFILE[sdk=iphoneos*]" = DefaultProfileUuid; SDKROOT = iphoneos2.0; }; name = Release;