adium 3242:baccda5d58e9: Fixes #14106. Change some definition ch...

[commits at adium.im]

details:	http://hg.adium.im/adium/rev/baccda5d58e9
revision:	3242:baccda5d58e9
author:		Stephen Holt <sholt at adium.im>
date:		Tue Jun 22 12:35:57 2010 -0700

Fixes #14106. Change some definition checks for iOS builds that were confusing the build with a 10.6 sdk.  Oops.

diffs (124 lines):

diff -r d322fd75bf16 -r baccda5d58e9 Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj
--- a/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj	Tue Jun 22 00:51:44 2010 +0200
+++ b/Frameworks/AutoHyperlinks Framework/AutoHyperlinks.framework.xcodeproj/project.pbxproj	Tue Jun 22 12:35:57 2010 -0700
@@ -627,6 +627,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7E0CF31B11769FE700EDC305 /* Release-Debug.xcconfig */;
 			buildSettings = {
+				SDKROOT = macosx10.6;
 			};
 			name = "Release-Debug";
 		};
@@ -903,6 +904,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7E0CF30C11769F4C00EDC305 /* Debug.xcconfig */;
 			buildSettings = {
+				SDKROOT = macosx10.6;
 			};
 			name = Debug;
 		};
@@ -910,6 +912,7 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 7E0CF31811769FBD00EDC305 /* Release.xcconfig */;
 			buildSettings = {
+				SDKROOT = macosx10.6;
 			};
 			name = Release;
 		};
diff -r d322fd75bf16 -r baccda5d58e9 Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.h
--- a/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.h	Tue Jun 22 00:51:44 2010 +0200
+++ b/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.h	Tue Jun 22 12:35:57 2010 -0700
@@ -47,7 +47,7 @@
 {
 	NSDictionary        *m_urlSchemes;
 	NSString            *m_scanString;
-#ifdef TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
 	NSString            *m_linkifiedString;
 #else
 	NSAttributedString  *m_scanAttrString;
@@ -77,7 +77,7 @@
  */
 + (id)strictHyperlinkScannerWithString:(NSString *)inString;
 
-#ifndef TARGET_OS_IPHONE
+#if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
 /*!
  * @brief Allocs and inits a new lax AHHyperlinkScanner with the given attributed string
  *
@@ -116,7 +116,7 @@
  */
 - (id)initWithString:(NSString *)inString usingStrictChecking:(BOOL)flag;
 
-#ifndef TARGET_OS_IPHONE
+#if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
 /*!
  * @brief Init
  *
@@ -150,7 +150,7 @@
  */
 - (NSArray *)allURIs;
 
-#ifdef TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
 /*!
  * @brief Scans the stored string for URIs then adds the link attribs and objects.
  * @return An autoreleased NSString.
diff -r d322fd75bf16 -r baccda5d58e9 Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m
--- a/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m	Tue Jun 22 00:51:44 2010 +0200
+++ b/Frameworks/AutoHyperlinks Framework/Source/AHHyperlinkScanner.m	Tue Jun 22 12:35:57 2010 -0700
@@ -36,7 +36,7 @@
 
 @interface AHHyperlinkScanner (PRIVATE)
 - (AHMarkedHyperlink *)nextURIFromLocation:(unsigned long *)_scanLocation;
-#ifdef TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
 - (NSString *)_createLinkifiedString;
 #else
 - (NSAttributedString *)_createLinkifiedString;
@@ -101,7 +101,7 @@
 	return [[[[self class] alloc] initWithString:inString usingStrictChecking:YES] autorelease];
 }
 
-#ifndef TARGET_OS_IPHONE
+#if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
 + (id)hyperlinkScannerWithAttributedString:(NSAttributedString *)inString
 {
 	return [[[[self class] alloc] initWithAttributedString:inString usingStrictChecking:NO] autorelease];
@@ -119,7 +119,7 @@
 	if((self = [super init])){
 		self.scanLocation = 0;
 		m_linkifiedString = nil;
-#ifndef TARGET_OS_IPHONE
+#if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
 		m_scanAttrString = nil;
 #endif
 	}
@@ -139,7 +139,7 @@
 	return self;
 }
 
-#ifndef TARGET_OS_IPHONE
+#if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
 - (id)initWithAttributedString:(NSAttributedString *)inString usingStrictChecking:(BOOL)flag
 {
 	if((self = [super init])){
@@ -161,7 +161,9 @@
 	[m_linkifiedString release];
 	[m_scanString release];
 	[m_urlSchemes release];
+#if !TARGET_OS_IPHONE && !TARGET_IPHONE_SIMULATOR
 	if(m_scanAttrString) [m_scanAttrString release];
+#endif
 	[super dealloc];
 }
 
@@ -364,7 +366,7 @@
 	return rangeArray;
 }
 
-#ifdef TARGET_OS_IPHONE
+#if TARGET_OS_IPHONE || TARGET_IPHONE_SIMULATOR
 -(NSString *)_createLinkifiedString
 {
 	NSMutableString       *_linkifiedString;