Skip to content

Commit

Permalink
Merge pull request #26 from 'booyah/llvm3-xcode42' into booyah/booyah
Browse files Browse the repository at this point in the history
  • Loading branch information
Brian Chapados committed Oct 27, 2011
2 parents 1ed376d + f02ca28 commit 1246651
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 9 deletions.
10 changes: 10 additions & 0 deletions .gitignore
@@ -0,0 +1,10 @@
.DS_Store
.svn/
*.pbxuser
*.mode1v3
*.mode2v3
*.perspectivev3
xcuserdata/
*.xcuserdatad/
build/
DerivedData/
2 changes: 1 addition & 1 deletion FontLabel/Classes/FontLabel/ZAttributedString.m
Expand Up @@ -291,7 +291,7 @@ - (NSDictionary *)attributesAtIndex:(NSUInteger)index longestEffectiveRange:(NSR
NSUInteger endRunIndex = runIndex+1; NSUInteger endRunIndex = runIndex+1;
runIndex--; runIndex--;
// search backwards // search backwards
while (runIndex >= 0) { while (runIndex < NSNotFound) {
if (run.index <= rangeLimit.location) { if (run.index <= rangeLimit.location) {
break; break;
} }
Expand Down
13 changes: 5 additions & 8 deletions FontLabel/FontLabel.xcodeproj/project.pbxproj
Expand Up @@ -3,7 +3,7 @@
archiveVersion = 1; archiveVersion = 1;
classes = { classes = {
}; };
objectVersion = 45; objectVersion = 46;
objects = { objects = {


/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
Expand Down Expand Up @@ -226,8 +226,11 @@
/* Begin PBXProject section */ /* Begin PBXProject section */
29B97313FDCFA39411CA2CEA /* Project object */ = { 29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = {
LastUpgradeCheck = 0420;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "FontLabel" */; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "FontLabel" */;
compatibilityVersion = "Xcode 3.1"; compatibilityVersion = "Xcode 3.2";
developmentRegion = English; developmentRegion = English;
hasScannedForEncodings = 1; hasScannedForEncodings = 1;
knownRegions = ( knownRegions = (
Expand Down Expand Up @@ -353,7 +356,6 @@
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
); );
GCC_DYNAMIC_NO_PIC = NO; GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_OPTIMIZATION_LEVEL = 0; GCC_OPTIMIZATION_LEVEL = 0;
INFOPLIST_FILE = "Unit Tests-Info.plist"; INFOPLIST_FILE = "Unit Tests-Info.plist";
Expand All @@ -365,7 +367,6 @@
"-framework", "-framework",
UIKit, UIKit,
); );
PREBINDING = NO;
PRODUCT_NAME = "Unit Tests"; PRODUCT_NAME = "Unit Tests";
WRAPPER_EXTENSION = octest; WRAPPER_EXTENSION = octest;
}; };
Expand All @@ -381,7 +382,6 @@
"\"$(SDKROOT)/Developer/Library/Frameworks\"", "\"$(SDKROOT)/Developer/Library/Frameworks\"",
"\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"", "\"$(DEVELOPER_LIBRARY_DIR)/Frameworks\"",
); );
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES; GCC_ENABLE_OBJC_EXCEPTIONS = YES;
INFOPLIST_FILE = "Unit Tests-Info.plist"; INFOPLIST_FILE = "Unit Tests-Info.plist";
OTHER_LDFLAGS = ( OTHER_LDFLAGS = (
Expand All @@ -392,7 +392,6 @@
"-framework", "-framework",
UIKit, UIKit,
); );
PREBINDING = NO;
PRODUCT_NAME = "Unit Tests"; PRODUCT_NAME = "Unit Tests";
WRAPPER_EXTENSION = octest; WRAPPER_EXTENSION = octest;
ZERO_LINK = NO; ZERO_LINK = NO;
Expand All @@ -412,7 +411,6 @@
GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_SIGN_COMPARE = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
ONLY_ACTIVE_ARCH = YES; ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
}; };
name = Debug; name = Debug;
Expand All @@ -429,7 +427,6 @@
GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_MISSING_PARENTHESES = YES;
GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_SIGN_COMPARE = YES;
GCC_WARN_UNUSED_VARIABLE = YES; GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
SDKROOT = iphoneos; SDKROOT = iphoneos;
}; };
name = Release; name = Release;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 1246651

Please sign in to comment.