From 54a238f5a90e8d097effb4c98de76d797ec6dd65 Mon Sep 17 00:00:00 2001 From: Stephan Jaetzold Date: Tue, 22 Apr 2014 17:31:26 +0200 Subject: [PATCH 1/4] Fix compiler error about initializing const with default null --- UIKit/Classes/UIStringDrawing.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/UIKit/Classes/UIStringDrawing.h b/UIKit/Classes/UIStringDrawing.h index c8b7d909..5c42b09f 100644 --- a/UIKit/Classes/UIStringDrawing.h +++ b/UIKit/Classes/UIStringDrawing.h @@ -50,10 +50,10 @@ typedef enum { UIBaselineAdjustmentNone, } UIBaselineAdjustment; -NSString *const UITextAttributeFont; -NSString *const UITextAttributeTextColor; -NSString *const UITextAttributeTextShadowColor; -NSString *const UITextAttributeTextShadowOffset; +extern NSString *const UITextAttributeFont; +extern NSString *const UITextAttributeTextColor; +extern NSString *const UITextAttributeTextShadowColor; +extern NSString *const UITextAttributeTextShadowOffset; @class UIFont; From f6c2c2576963bc0117ad1bce76b4c153224ccc2b Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Mon, 6 Oct 2014 14:20:44 -0700 Subject: [PATCH 2/4] use default architectures --- UIKit/UIKit.xcodeproj/project.pbxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/UIKit/UIKit.xcodeproj/project.pbxproj b/UIKit/UIKit.xcodeproj/project.pbxproj index d47a64a1..cfba74a7 100644 --- a/UIKit/UIKit.xcodeproj/project.pbxproj +++ b/UIKit/UIKit.xcodeproj/project.pbxproj @@ -1356,7 +1356,6 @@ INSTALL_PATH = "@executable_path/../Frameworks"; PRODUCT_NAME = UIKit; SYMROOT = ../build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = framework; }; name = Debug; @@ -1376,7 +1375,6 @@ INSTALL_PATH = "@executable_path/../Frameworks"; PRODUCT_NAME = UIKit; SYMROOT = ../build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = framework; }; name = Release; @@ -1384,7 +1382,6 @@ 1DEB91B208733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -1399,7 +1396,6 @@ 1DEB91B308733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; From 8441788e73b630bb282d180f8f4bd5fba6f0cb0c Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Wed, 8 Oct 2014 19:41:13 -0700 Subject: [PATCH 3/4] disable signing of Chameleon's UIKit --- UIKit/UIKit.xcodeproj/project.pbxproj | 1 - 1 file changed, 1 deletion(-) diff --git a/UIKit/UIKit.xcodeproj/project.pbxproj b/UIKit/UIKit.xcodeproj/project.pbxproj index cfba74a7..c35b3761 100644 --- a/UIKit/UIKit.xcodeproj/project.pbxproj +++ b/UIKit/UIKit.xcodeproj/project.pbxproj @@ -1396,7 +1396,6 @@ 1DEB91B308733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application"; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES; From 2c0e5208f1f7afd6489fd7a2fae80b16bc5573b5 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Tue, 14 Oct 2014 11:20:06 -0700 Subject: [PATCH 4/4] Fix compiler warning about direct access to 'isa' --- UIKit/UIKit.xcodeproj/project.pbxproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/UIKit/UIKit.xcodeproj/project.pbxproj b/UIKit/UIKit.xcodeproj/project.pbxproj index c35b3761..f12318b1 100644 --- a/UIKit/UIKit.xcodeproj/project.pbxproj +++ b/UIKit/UIKit.xcodeproj/project.pbxproj @@ -1382,6 +1382,7 @@ 1DEB91B208733DA50010E9CD /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_OPTIMIZATION_LEVEL = 0; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; @@ -1396,6 +1397,7 @@ 1DEB91B308733DA50010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES;