Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #159 from dhoerl/master

Fix iOS unit test file - its missing a header
  • Loading branch information...
commit 6dfcd6e47560b0bf0f3ae27a9dbc8eff26e402b3 2 parents fe89a60 + 48ec7b4
Oliver Drobnik authored
1  Core/Test/Source/UIColorHTMLTest.m
View
@@ -6,6 +6,7 @@
// Copyright 2011 Drobnik.com. All rights reserved.
//
+#import "DTCoreText.h"
#import "UIColorHTMLTest.h"
#import "DTCoreText.h"
20 DTCoreText.xcodeproj/project.pbxproj
View
@@ -1117,7 +1117,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
- LastUpgradeCheck = 0420;
+ LastUpgradeCheck = 0430;
ORGANIZATIONNAME = Drobnik.com;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "DTCoreText" */;
@@ -1499,6 +1499,7 @@
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Demo/DemoApp-Prefix.pch";
+ GCC_THUMB_SUPPORT = NO;
INFOPLIST_FILE = "Demo/DemoApp-Info.plist";
OTHER_LDFLAGS = (
"-all_load",
@@ -1516,6 +1517,7 @@
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Demo/DemoApp-Prefix.pch";
+ GCC_THUMB_SUPPORT = NO;
INFOPLIST_FILE = "Demo/DemoApp-Info.plist";
OTHER_LDFLAGS = (
"-all_load",
@@ -1548,6 +1550,7 @@
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "Core/DTCoreText-Info.plist";
INFOPLIST_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Info.plist";
@@ -1575,6 +1578,7 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Core/DTCoreText-Prefix.pch";
+ GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "Core/DTCoreText-Info.plist";
INFOPLIST_PATH = "$(UNLOCALIZED_RESOURCES_FOLDER_PATH)/Info.plist";
@@ -1593,6 +1597,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = NO;
DSTROOT = /tmp/DTCoreText.dst;
GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -1605,6 +1610,7 @@
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_THUMB_SUPPORT = NO;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = DTCoreText;
PUBLIC_HEADERS_FOLDER_PATH = ../../DTCoreText;
@@ -1616,11 +1622,13 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
+ ARCHS = "$(ARCHS_STANDARD_32_BIT)";
COPY_PHASE_STRIP = YES;
DSTROOT = /tmp/DTCoreText.dst;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Core/DTCoreText-Prefix.pch";
+ GCC_THUMB_SUPPORT = NO;
OTHER_LDFLAGS = "-ObjC";
PRODUCT_NAME = DTCoreText;
PUBLIC_HEADERS_FOLDER_PATH = ../../DTCoreText;
@@ -1632,6 +1640,7 @@
A7174BC614F288F900C57464 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_THUMB_SUPPORT = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Debug;
@@ -1639,6 +1648,7 @@
A7174BC714F288F900C57464 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ GCC_THUMB_SUPPORT = NO;
PRODUCT_NAME = "$(TARGET_NAME)";
};
name = Release;
@@ -1662,6 +1672,7 @@
"$(inherited)",
);
GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+ GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "Core/Test/UnitTest-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1682,6 +1693,7 @@
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = "Core/Test/UnitTest-Prefix.pch";
+ GCC_THUMB_SUPPORT = NO;
GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
INFOPLIST_FILE = "Core/Test/UnitTest-Info.plist";
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1752,11 +1764,12 @@
CLANG_ENABLE_OBJC_ARC = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_THUMB_SUPPORT = NO;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/libxml2;
- IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
SDKROOT = iphoneos;
};
name = Debug;
@@ -1771,11 +1784,12 @@
CLANG_ENABLE_OBJC_ARC = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_THUMB_SUPPORT = NO;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/libxml2;
- IPHONEOS_DEPLOYMENT_TARGET = 4.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 4.3;
OTHER_CFLAGS = "-DNS_BLOCK_ASSERTIONS=1";
SDKROOT = iphoneos;
};
Please sign in to comment.
Something went wrong with that request. Please try again.