mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

iphone build tweaks: adds some error flags, fixes errors, and removes llvm as the compiler

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@1695 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
smparkes@smparkes.net 2011-01-06 01:46:15 +00:00
parent 79381116c1
commit e72c2ab85f
4 changed files with 28 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -300,10 +300,6 @@
GCC_PREFIX_HEADER = ScanTest_Prefix.pch; GCC_PREFIX_HEADER = ScanTest_Prefix.pch;
GCC_SYMBOLS_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO;
INFOPLIST_FILE = "ScanTest-Info.plist"; INFOPLIST_FILE = "ScanTest-Info.plist";
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
"\"$(SRCROOT)/../ZXingWidget/build/Debug-iphoneos\"",
);
PRODUCT_NAME = ScanTest; PRODUCT_NAME = ScanTest;
VALIDATE_PRODUCT = YES; VALIDATE_PRODUCT = YES;
}; };
@ -325,6 +321,12 @@
IPHONEOS_DEPLOYMENT_TARGET = 4.0; IPHONEOS_DEPLOYMENT_TARGET = 4.0;
PREBINDING = NO; PREBINDING = NO;
SDKROOT = iphoneos4.2; SDKROOT = iphoneos4.2;
WARNING_CFLAGS = (
"-Werror",
"-Wall",
"-Wextra",
"-Wno-unused-parameter",
);
}; };
name = Debug; name = Debug;
}; };
@ -344,6 +346,12 @@
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1"; OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
PREBINDING = NO; PREBINDING = NO;
SDKROOT = iphoneos4.2; SDKROOT = iphoneos4.2;
WARNING_CFLAGS = (
"-Werror",
"-Wall",
"-Wextra",
"-Wno-unused-parameter",
);
}; };
name = Release; name = Release;
}; };

4
iphone/ZXingWidget/Classes/ZXingWidgetController.m
View file

@ -72,7 +72,7 @@
} }
- (void)dealloc { - (void)dealloc {
if (beepSound != -1) { if (beepSound != (SystemSoundID)-1) {
AudioServicesDisposeSystemSoundID(beepSound); AudioServicesDisposeSystemSoundID(beepSound);
} }
@ -231,7 +231,7 @@
- (void)presentResultForString:(NSString *)resultString { - (void)presentResultForString:(NSString *)resultString {
self.result = [ResultParser parsedResultForString:resultString]; self.result = [ResultParser parsedResultForString:resultString];
if (beepSound != -1) { if (beepSound != (SystemSoundID)-1) {
AudioServicesPlaySystemSound(beepSound); AudioServicesPlaySystemSound(beepSound);
} }
#ifdef DEBUG #ifdef DEBUG

3
iphone/ZXingWidget/Classes/actions/AddContactAction.m
View file

@ -70,7 +70,7 @@
stringByTrimmingCharactersInSet:whitespaceSet] stringByTrimmingCharactersInSet:whitespaceSet]
componentsSeparatedByCharactersInSet:whitespaceSet]; componentsSeparatedByCharactersInSet:whitespaceSet];
ABRecordSetValue(person, kABPersonFirstNameProperty, [firstNames objectAtIndex:0], error); ABRecordSetValue(person, kABPersonFirstNameProperty, [firstNames objectAtIndex:0], error);
for (int i = 1; i < [firstNames count]; i++) { for (unsigned i = 1; i < [firstNames count]; i++) {
ABRecordSetValue(person, kABPersonMiddleNameProperty, [firstNames objectAtIndex:1], error); ABRecordSetValue(person, kABPersonMiddleNameProperty, [firstNames objectAtIndex:1], error);
} }
} else { } else {
@ -237,5 +237,6 @@
[urlString release]; [urlString release];
[address release]; [address release];
[organization release]; [organization release];
[super dealloc];
} }
@end @end

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

@ -1214,7 +1214,12 @@
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO; PREBINDING = NO;
SDKROOT = iphoneos4.2; SDKROOT = iphoneos4.2;
WARNING_CFLAGS = "-Werror"; WARNING_CFLAGS = (
"-Wall",
"-Wextra",
"-Werror",
"-Wno-unused-parameter",
);
}; };
name = Debug; name = Debug;
}; };
@ -1223,7 +1228,6 @@
buildSettings = { buildSettings = {
ARCHS = "$(ARCHS_STANDARD_32_BIT)"; ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99; GCC_C_LANGUAGE_STANDARD = c99;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = ../../cpp/core/src; HEADER_SEARCH_PATHS = ../../cpp/core/src;
@ -1231,7 +1235,12 @@
OTHER_LDFLAGS = "-ObjC"; OTHER_LDFLAGS = "-ObjC";
PREBINDING = NO; PREBINDING = NO;
SDKROOT = iphoneos4.2; SDKROOT = iphoneos4.2;
WARNING_CFLAGS = "-Werror"; WARNING_CFLAGS = (
"-Wall",
"-Wextra",
"-Werror",
"-Wno-unused-parameter",
);
}; };
name = Release; name = Release;
}; };