From 5caed4ec526772111483cd35c5f6c72b344ac3fa Mon Sep 17 00:00:00 2001 From: Wei Mingzhi Date: Thu, 6 Nov 2014 00:23:51 +0800 Subject: [PATCH] fixed xcode 6.1 build error --- Classes/MobileTerminalAppDelegate.m | 2 -- Classes/VT100/ColorMap.m | 3 --- MobileTerminal.xcodeproj/project.pbxproj | 8 ++++++-- svnversion.h | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/Classes/MobileTerminalAppDelegate.m b/Classes/MobileTerminalAppDelegate.m index 60887ff..2d0e0f3 100644 --- a/Classes/MobileTerminalAppDelegate.m +++ b/Classes/MobileTerminalAppDelegate.m @@ -35,8 +35,6 @@ - (void)applicationDidFinishLaunching:(UIApplication *)application inPreferences = FALSE; } -static const NSTimeInterval kAnimationDuration = 1.00f; - - (void)preferencesButtonPressed:(UIView *)sender { inPreferences = TRUE; diff --git a/Classes/VT100/ColorMap.m b/Classes/VT100/ColorMap.m index c02b4aa..061cb72 100644 --- a/Classes/VT100/ColorMap.m +++ b/Classes/VT100/ColorMap.m @@ -4,9 +4,6 @@ #import "ColorMap.h" #import "VT100Terminal.h" -// 16 terminal color slots available -static const int kNumTerminalColors = 16; - @implementation ColorMap @synthesize background; diff --git a/MobileTerminal.xcodeproj/project.pbxproj b/MobileTerminal.xcodeproj/project.pbxproj index adff28d..8e97847 100755 --- a/MobileTerminal.xcodeproj/project.pbxproj +++ b/MobileTerminal.xcodeproj/project.pbxproj @@ -722,7 +722,7 @@ name = VT100Tests; productName = VT100Tests; productReference = 2C11C5B31013A5AF00A2746E /* VT100Tests.octest */; - productType = "com.apple.product-type.bundle"; + productType = "com.apple.product-type.bundle.ocunit-test"; }; 2C11C9311013F87100A2746E /* Terminal */ = { isa = PBXNativeTarget; @@ -778,13 +778,15 @@ name = PreferencesTests; productName = PreferencesTests; productReference = 2C72B2BB101ABA9100F10E63 /* PreferencesTests.octest */; - productType = "com.apple.product-type.bundle"; + productType = "com.apple.product-type.bundle.ocunit-test"; }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; + attributes = { + }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MobileTerminal" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; @@ -1043,6 +1045,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-"; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_OPTIMIZATION_LEVEL = 0; @@ -1063,6 +1066,7 @@ buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = "$(ARCHS_STANDARD_32_BIT)"; + "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "-"; COPY_PHASE_STRIP = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = MobileTerminal_Prefix.pch; diff --git a/svnversion.h b/svnversion.h index 373c7c4..3d1b7ad 100644 --- a/svnversion.h +++ b/svnversion.h @@ -1 +1 @@ -#define SVN_VERSION ((int)strtol("exported", NULL, 10)) +#define SVN_VERSION ((int)strtol("Unversioned directory", NULL, 10))