Revision: 4143
http://skim-app.svn.sourceforge.net/skim-app/?rev=4143&view=rev
Author: hofman
Date: 2008-07-07 12:22:54 -0700 (Mon, 07 Jul 2008)
Log Message:
-----------
Make framework and tool code 64-bit safe. Add a build config for Release with
GC and 64-bit support. Use build config files also for the tool. Add some
conditional defines to allow building for 10.4-only, though we don't have a
build config for that.
Modified Paths:
--------------
trunk/SkimNotes/Configurations/SkimNotes-Common.xcconfig
trunk/SkimNotes/Configurations/SkimNotes-Release.xcconfig
trunk/SkimNotes/NSFileManager_SKNExtensions.m
trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
trunk/SkimNotes/PDFDocument_SKNExtensions.m
trunk/SkimNotes/SKNAgentListener.h
trunk/SkimNotes/SKNAgentListener.m
trunk/SkimNotes/SKNExtendedAttributeManager.m
trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj
trunk/SkimNotes/SkimNotes_Prefix.pch
Added Paths:
-----------
trunk/SkimNotes/Configurations/SkimNotes-ReleaseGCSupport.xcconfig
Modified: trunk/SkimNotes/Configurations/SkimNotes-Common.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-Common.xcconfig 2008-07-07
17:05:56 UTC (rev 4142)
+++ trunk/SkimNotes/Configurations/SkimNotes-Common.xcconfig 2008-07-07
19:22:54 UTC (rev 4143)
@@ -1,6 +1,9 @@
SDKROOT = $(DEVELOPER_SDK_DIR)/MacOSX10.5.sdk
DEBUG_INFORMATION_FORMAT = dwarf
-MACOSX_DEPLOYMENT_TARGET = 10.4
+MACOSX_DEPLOYMENT_TARGET[arch=ppc] = 10.4
+MACOSX_DEPLOYMENT_TARGET[arch=i386] = 10.4
+MACOSX_DEPLOYMENT_TARGET[arch=ppc64] = 10.5
+MACOSX_DEPLOYMENT_TARGET[arch=x86_64] = 10.5
COPY_PHASE_STRIP = YES
STRIP_INSTALLED_PRODUCT = YES
STRIP_STYLE = all
Modified: trunk/SkimNotes/Configurations/SkimNotes-Release.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-Release.xcconfig 2008-07-07
17:05:56 UTC (rev 4142)
+++ trunk/SkimNotes/Configurations/SkimNotes-Release.xcconfig 2008-07-07
19:22:54 UTC (rev 4143)
@@ -1,6 +1,7 @@
#include "SkimNotes-Common.xcconfig"
ARCHS = ppc i386
+DEBUG_INFORMATION_FORMAT = dwarf-with-dsym
COPY_PHASE_STRIP = YES
STRIP_INSTALLED_PRODUCT = YES
STRIP_STYLE = all
@@ -18,7 +19,7 @@
GCC_C_LANGUAGE_STANDARD = compiler-default
-// I think this is set to avoid a compiler warning on BibDesk_vers.c
+// I think this is set to avoid a compiler warning on SkimNotes_vers.c
GCC_INPUT_FILETYPE = sourcecode.c.objc
GCC_WARN_CHECK_SWITCH_STATEMENTS = YES
Added: trunk/SkimNotes/Configurations/SkimNotes-ReleaseGCSupport.xcconfig
===================================================================
--- trunk/SkimNotes/Configurations/SkimNotes-ReleaseGCSupport.xcconfig
(rev 0)
+++ trunk/SkimNotes/Configurations/SkimNotes-ReleaseGCSupport.xcconfig
2008-07-07 19:22:54 UTC (rev 4143)
@@ -0,0 +1,8 @@
+#include "SkimNotes-Release.xcconfig"
+
+ARCHS = ppc i386 x86_64
+MACOSX_DEPLOYMENT_TARGET[arch=ppc] = 10.5
+MACOSX_DEPLOYMENT_TARGET[arch=i386] = 10.5
+MACOSX_DEPLOYMENT_TARGET[arch=ppc64] = 10.5
+MACOSX_DEPLOYMENT_TARGET[arch=x86_64] = 10.5
+GCC_ENABLE_OBJC_GC = supported
Modified: trunk/SkimNotes/NSFileManager_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/NSFileManager_SKNExtensions.m 2008-07-07 17:05:56 UTC
(rev 4142)
+++ trunk/SkimNotes/NSFileManager_SKNExtensions.m 2008-07-07 19:22:54 UTC
(rev 4143)
@@ -58,11 +58,11 @@
while (dict = [dictEnum nextObject]) {
NSString *type = [dict objectForKey:SKNPDFAnnotationTypeKey];
- unsigned int pageIndex = [[dict
objectForKey:SKNPDFAnnotationPageIndexKey] unsignedIntValue];
+ NSUInteger pageIndex = SKNUnsignedIntegerValue([dict
objectForKey:SKNPDFAnnotationPageIndexKey]);
NSString *string = [dict objectForKey:SKNPDFAnnotationTypeKey];
NSAttributedString *text = [dict objectForKey:SKNPDFAnnotationTextKey];
- [textString appendFormat:@"* %@, page %i\n\n", type, pageIndex + 1];
+ [textString appendFormat:@"* %@, page %lu\n\n", type, (long)pageIndex
+ 1];
if ([string length]) {
[textString appendString:string];
[textString appendString:@" \n\n"];
@@ -82,11 +82,11 @@
while (dict = [dictEnum nextObject]) {
NSString *type = [dict objectForKey:SKNPDFAnnotationTypeKey];
- unsigned int pageIndex = [[dict
objectForKey:SKNPDFAnnotationPageIndexKey] unsignedIntValue];
+ NSUInteger pageIndex = SKNUnsignedIntegerValue([dict
objectForKey:SKNPDFAnnotationPageIndexKey]);
NSString *string = [dict objectForKey:SKNPDFAnnotationTypeKey];
NSAttributedString *text = [dict objectForKey:SKNPDFAnnotationTextKey];
- [attrString replaceCharactersInRange:NSMakeRange([attrString length],
0) withString:[NSString stringWithFormat:@"* %@, page %i\n\n", type, pageIndex
+ 1]];
+ [attrString replaceCharactersInRange:NSMakeRange([attrString length],
0) withString:[NSString stringWithFormat:@"* %@, page %lu\n\n", type,
(long)pageIndex + 1]];
if ([string length]) {
[attrString replaceCharactersInRange:NSMakeRange([attrString
length], 0) withString:string];
[attrString replaceCharactersInRange:NSMakeRange([attrString
length], 0) withString:@" \n\n"];
@@ -300,7 +300,7 @@
if ([files containsObject:filename] == NO) {
filename = [[[path lastPathComponent]
stringByDeletingPathExtension] stringByAppendingPathExtension:extension];
if ([files containsObject:filename] == NO) {
- unsigned int idx = [[files
valueForKeyPath:@"pathExtension.lowercaseString"] indexOfObject:extension];
+ NSUInteger idx = [[files
valueForKeyPath:@"pathExtension.lowercaseString"] indexOfObject:extension];
filename = idx == NSNotFound ? nil : [files objectAtIndex:idx];
}
}
Modified: trunk/SkimNotes/PDFAnnotation_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2008-07-07 17:05:56 UTC
(rev 4142)
+++ trunk/SkimNotes/PDFAnnotation_SKNExtensions.m 2008-07-07 19:22:54 UTC
(rev 4143)
@@ -196,13 +196,13 @@
- (NSDictionary *)SkimNoteProperties{
PDFPage *page = [self page];
- unsigned int pageIndex = page ? [[page document] indexForPage:page] :
NSNotFound;
+ NSUInteger pageIndex = page ? [[page document] indexForPage:page] :
NSNotFound;
NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithCapacity:5];
[dict setValue:[self type] forKey:SKNPDFAnnotationTypeKey];
[dict setValue:[self string] forKey:SKNPDFAnnotationContentsKey];
[dict setValue:[self color] forKey:SKNPDFAnnotationColorKey];
[dict setValue:NSStringFromRect([self bounds])
forKey:SKNPDFAnnotationBoundsKey];
- [dict setValue:[NSNumber numberWithUnsignedInt:pageIndex]
forKey:SKNPDFAnnotationPageIndexKey];
+ [dict setValue:SKNNumberWithUnsignedInteger(pageIndex)
forKey:SKNPDFAnnotationPageIndexKey];
if ([self border]) {
[dict setValue:[NSNumber numberWithFloat:[[self border] lineWidth]]
forKey:SKNPDFAnnotationLineWidthKey];
[dict setValue:[NSNumber numberWithInt:[[self border] style]]
forKey:SKNPDFAnnotationBorderStyleKey];
@@ -313,6 +313,8 @@
@interface PDFAnnotationFreeText (SKNPDFAnnotationFreeTextPrivateDeclarations)
- (int)rotation;
- (void)setRotation:(int)rotation;
+- (NSColor *)fontColor;
+- (void)setFontColor:(NSColor *)color;
@end
@@ -374,7 +376,7 @@
Class arrayClass = [NSArray class];
NSArray *pointStrings = [dict
objectForKey:SKNPDFAnnotationQuadrilateralPointsKey];
if ([pointStrings isKindOfClass:arrayClass]) {
- int i, iMax = [pointStrings count];
+ NSUInteger i, iMax = [pointStrings count];
NSMutableArray *quadPoints = [[NSMutableArray alloc]
initWithCapacity:iMax];
for (i = 0; i < iMax; i++) {
NSPoint p = NSPointFromString([pointStrings objectAtIndex:i]);
@@ -394,7 +396,7 @@
NSMutableDictionary *dict = [[[super SkimNoteProperties] mutableCopy]
autorelease];
NSArray *quadPoints = [self quadrilateralPoints];
if (quadPoints) {
- int i, iMax = [quadPoints count];
+ NSUInteger i, iMax = [quadPoints count];
NSMutableArray *quadPointStrings = [[NSMutableArray alloc]
initWithCapacity:iMax];
for (i = 0; i < iMax; i++)
[quadPointStrings addObject:NSStringFromPoint([[quadPoints
objectAtIndex:i] pointValue])];
Modified: trunk/SkimNotes/PDFDocument_SKNExtensions.m
===================================================================
--- trunk/SkimNotes/PDFDocument_SKNExtensions.m 2008-07-07 17:05:56 UTC (rev
4142)
+++ trunk/SkimNotes/PDFDocument_SKNExtensions.m 2008-07-07 19:22:54 UTC (rev
4143)
@@ -75,7 +75,7 @@
// create new annotations from the dictionary and add them to their page
and to the document
while (dict = [e nextObject]) {
- unsigned int pageIndex = [[dict
objectForKey:SKNPDFAnnotationPageIndexKey] unsignedIntValue];
+ NSUInteger pageIndex = SKNUnsignedIntegerValue([dict
objectForKey:SKNPDFAnnotationPageIndexKey]);
if (annotation = [[PDFAnnotation alloc]
initSkimNoteWithProperties:dict]) {
if (pageIndex == NSNotFound)
pageIndex = 0;
Modified: trunk/SkimNotes/SKNAgentListener.h
===================================================================
--- trunk/SkimNotes/SKNAgentListener.h 2008-07-07 17:05:56 UTC (rev 4142)
+++ trunk/SkimNotes/SKNAgentListener.h 2008-07-07 19:22:54 UTC (rev 4143)
@@ -37,6 +37,19 @@
#import <Cocoa/Cocoa.h>
+#ifndef NSINTEGER_DEFINED
+ #ifdef NS_BUILD_32_LIKE_64
+ typedef long NSInteger;
+ typedef unsigned long NSUInteger;
+ #else
+ typedef int NSInteger;
+ typedef unsigned int NSUInteger;
+ #endif
+ #define NSIntegerMax LONG_MAX
+ #define NSIntegerMin LONG_MIN
+ #define NSUIntegerMax ULONG_MAX
+ #define NSINTEGER_DEFINED 1
+#endif
@interface SKNAgentListener : NSObject {
NSConnection *connection;
Modified: trunk/SkimNotes/SKNAgentListener.m
===================================================================
--- trunk/SkimNotes/SKNAgentListener.m 2008-07-07 17:05:56 UTC (rev 4142)
+++ trunk/SkimNotes/SKNAgentListener.m 2008-07-07 19:22:54 UTC (rev 4143)
@@ -44,7 +44,6 @@
#define SKIM_RTF_NOTES_KEY @"net_sourceforge_skim-app_rtf_notes"
#define SKIM_TEXT_NOTES_KEY @"net_sourceforge_skim-app_text_notes"
-
@implementation SKNAgentListener
- (id)initWithServerName:(NSString *)serverName;
@@ -89,7 +88,7 @@
if ([files containsObject:filename] == NO) {
filename = [[[path lastPathComponent]
stringByDeletingPathExtension] stringByAppendingPathExtension:extension];
if ([files containsObject:filename] == NO) {
- unsigned int idx = [[files
valueForKeyPath:@"pathExtension.lowercaseString"] indexOfObject:@"skim"];
+ NSUInteger idx = [[files
valueForKeyPath:@"pathExtension.lowercaseString"] indexOfObject:@"skim"];
filename = idx == NSNotFound ? nil : [files objectAtIndex:idx];
}
}
Modified: trunk/SkimNotes/SKNExtendedAttributeManager.m
===================================================================
--- trunk/SkimNotes/SKNExtendedAttributeManager.m 2008-07-07 17:05:56 UTC
(rev 4142)
+++ trunk/SkimNotes/SKNExtendedAttributeManager.m 2008-07-07 19:22:54 UTC
(rev 4143)
@@ -122,7 +122,7 @@
else
xopts = XATTR_NOFOLLOW;
- ssize_t bufSize;
+ size_t bufSize;
ssize_t status;
// call with NULL as attr name to get the size of the returned buffer
@@ -145,7 +145,7 @@
return nil;
}
- int idx, start = 0;
+ unsigned int idx, start = 0;
NSString *attribute = nil;
NSMutableArray *attrs = [NSMutableArray array];
@@ -209,7 +209,7 @@
else
xopts = XATTR_NOFOLLOW;
- ssize_t bufSize;
+ size_t bufSize;
ssize_t status;
status = getxattr(fsPath, attrName, NULL, 0, 0, xopts);
@@ -251,15 +251,15 @@
BOOL success = (nil != uniqueValue && numberOfFragments > 0);
if (success == NO)
- NSLog(@"failed to read unique key %@ for %i fragments from
property list.", uniqueKey, numberOfFragments);
+ NSLog(@"failed to read unique key %@ for %u fragments from
property list.", uniqueKey, numberOfFragments);
// reassemble the original data object
for (i = 0; success && i < numberOfFragments; i++) {
NSError *tmpError = nil;
- name = [NSString stringWithFormat:@"[EMAIL PROTECTED]",
uniqueValue, i];
+ name = [NSString stringWithFormat:@"[EMAIL PROTECTED]",
uniqueValue, i];
subdata = [self extendedAttributeNamed:name atPath:path
traverseLink:follow error:&tmpError];
if (nil == subdata) {
- NSLog(@"failed to find subattribute %@ of %i for attribute
named [EMAIL PROTECTED] %@", name, numberOfFragments, attr, [tmpError
localizedDescription]);
+ NSLog(@"failed to find subattribute %@ of %u for attribute
named [EMAIL PROTECTED] %@", name, numberOfFragments, attr, [tmpError
localizedDescription]);
success = NO;
} else {
[buffer appendData:subdata];
@@ -342,7 +342,7 @@
const char *valuePtr = [value bytes];
for (j = 0; success && j < numberOfFragments; j++) {
- name = [[NSString alloc] initWithFormat:@"[EMAIL PROTECTED]",
uniqueValue, j];
+ name = [[NSString alloc] initWithFormat:@"[EMAIL PROTECTED]",
uniqueValue, j];
char *subdataPtr = (char *)&valuePtr[j * MAX_XATTR_LENGTH];
unsigned int subdataLen = j == numberOfFragments - 1 ? ([value
length] - j * MAX_XATTR_LENGTH) : MAX_XATTR_LENGTH;
@@ -400,7 +400,7 @@
else
xopts = XATTR_NOFOLLOW;
- ssize_t bufSize;
+ size_t bufSize;
ssize_t status;
status = getxattr(fsPath, attrName, NULL, 0, 0, xopts);
@@ -431,7 +431,7 @@
// remove the sub attributes
for (i = 0; i < numberOfFragments; i++) {
- name = [NSString stringWithFormat:@"[EMAIL PROTECTED]",
uniqueValue, i];
+ name = [NSString stringWithFormat:@"[EMAIL PROTECTED]",
uniqueValue, i];
const char *subAttrName = [name UTF8String];
status = removexattr(fsPath, subAttrName, xopts);
if (status == -1) {
@@ -615,10 +615,11 @@
- (BOOL)isBzipData:(NSData *)data;
{
static NSData *bzipHeaderData = nil;
- static unsigned int bzipHeaderDataLength;
+ static unsigned int bzipHeaderDataLength = 0;
if (nil == bzipHeaderData) {
char *h = "BZh";
bzipHeaderData = [[NSData alloc] initWithBytes:h length:strlen(h)];
+ bzipHeaderDataLength = [bzipHeaderData length];
}
return [data length] >= bzipHeaderDataLength && [bzipHeaderData
isEqual:[data subdataWithRange:NSMakeRange(0, bzipHeaderDataLength)]];
@@ -627,7 +628,7 @@
- (BOOL)isPlistData:(NSData *)data;
{
static NSData *plistHeaderData = nil;
- static unsigned int plistHeaderDataLength;
+ static unsigned int plistHeaderDataLength = 0;
if (nil == plistHeaderData) {
char *h = "bplist00";
plistHeaderData = [[NSData alloc] initWithBytes:h length:strlen(h)];
Modified: trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj
===================================================================
--- trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj 2008-07-07 17:05:56 UTC
(rev 4142)
+++ trunk/SkimNotes/SkimNotes.xcodeproj/project.pbxproj 2008-07-07 19:22:54 UTC
(rev 4143)
@@ -35,6 +35,7 @@
/* Begin PBXBuildFile section */
8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ =
{isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */;
};
+ CE1AB1060E2297C800FBE87A /* SkimNotes-ReleaseGCSupport.xcconfig
in Resources */ = {isa = PBXBuildFile; fileRef = CE1AB1050E2297C500FBE87A /*
SkimNotes-ReleaseGCSupport.xcconfig */; };
CE3907B00E082C460015B0B7 /* SkimNotes.strings in Resources */ =
{isa = PBXBuildFile; fileRef = CE3907AF0E082C460015B0B7 /* SkimNotes.strings
*/; };
CEBA2B5E0E0566DF0000B2E6 /* SKNAgentListener.m in Sources */ =
{isa = PBXBuildFile; fileRef = CEBA2B5B0E0566DF0000B2E6 /* SKNAgentListener.m
*/; };
CEBA2B5F0E0566DF0000B2E6 /* skimnotes.m in Sources */ = {isa =
PBXBuildFile; fileRef = CEBA2B5D0E0566DF0000B2E6 /* skimnotes.m */; };
@@ -80,6 +81,7 @@
32DBCF5E0370ADEE00C91783 /* SkimNotes_Prefix.pch */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SkimNotes_Prefix.pch; sourceTree = "<group>"; };
8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path =
Info.plist; sourceTree = "<group>"; };
8DC2EF5B0486A6940098B216 /* SkimNotes.framework */ = {isa =
PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0;
path = SkimNotes.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+ CE1AB1050E2297C500FBE87A /* SkimNotes-ReleaseGCSupport.xcconfig
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
text.xcconfig; name = "SkimNotes-ReleaseGCSupport.xcconfig"; path =
"Configurations/SkimNotes-ReleaseGCSupport.xcconfig"; sourceTree = "<group>"; };
CE3907AD0E082C2D0015B0B7 /* English */ = {isa =
PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings;
name = English; path = English.lproj/SkimNotes.strings; sourceTree = "<group>";
};
CE3907B40E082C900015B0B7 /* Dutch */ = {isa = PBXFileReference;
lastKnownFileType = text.plist.strings; name = Dutch; path =
Dutch.lproj/SkimNotes.strings; sourceTree = "<group>"; };
CE3907B50E082C930015B0B7 /* French */ = {isa =
PBXFileReference; lastKnownFileType = text.plist.strings; name = French; path =
French.lproj/SkimNotes.strings; sourceTree = "<group>"; };
@@ -251,6 +253,7 @@
CEBA30770E06DC2B0000B2E6 /*
SkimNotes-Common.xcconfig */,
CEBA307A0E06DC680000B2E6 /*
SkimNotes-Debug.xcconfig */,
CEBA307D0E06DC950000B2E6 /*
SkimNotes-Release.xcconfig */,
+ CE1AB1050E2297C500FBE87A /*
SkimNotes-ReleaseGCSupport.xcconfig */,
);
name = Configurations;
sourceTree = "<group>";
@@ -347,6 +350,7 @@
buildActionMask = 2147483647;
files = (
CE3907B00E082C460015B0B7 /* SkimNotes.strings
in Resources */,
+ CE1AB1060E2297C800FBE87A /*
SkimNotes-ReleaseGCSupport.xcconfig in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -443,7 +447,6 @@
baseConfigurationReference = CEBA307A0E06DC680000B2E6
/* SkimNotes-Debug.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
@@ -466,7 +469,6 @@
baseConfigurationReference = CEBA307D0E06DC950000B2E6
/* SkimNotes-Release.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_VERSION = A;
@@ -485,14 +487,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
- SDKROOT = macosx10.5;
};
name = Debug;
};
@@ -500,15 +499,79 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = "$(ARCHS_STANDARD_32_BIT)";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
- SDKROOT = macosx10.5;
};
name = Release;
};
+ CE1AB1000E22971400FBE87A /* Release (GC dual-mode) */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNUSED_VARIABLE = YES;
+ PREBINDING = NO;
+ };
+ name = "Release (GC dual-mode)";
+ };
+ CE1AB1010E22971400FBE87A /* Release (GC dual-mode) */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = CE1AB1050E2297C500FBE87A
/* SkimNotes-ReleaseGCSupport.xcconfig */;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ DYLIB_COMPATIBILITY_VERSION = 1;
+ DYLIB_CURRENT_VERSION = 1;
+ FRAMEWORK_VERSION = A;
+ GCC_MODEL_TUNING = G5;
+ GCC_PRECOMPILE_PREFIX_HEADER = YES;
+ GCC_PREFIX_HEADER = SkimNotes_Prefix.pch;
+ INFOPLIST_FILE = Info.plist;
+ INSTALL_PATH = "@executable_path/../Frameworks";
+ LD_DYLIB_INSTALL_NAME =
"@executable_path/../Frameworks/$(EXECUTABLE_PATH)";
+ PRODUCT_NAME = SkimNotes;
+ WRAPPER_EXTENSION = framework;
+ };
+ name = "Release (GC dual-mode)";
+ };
+ CE1AB1020E22971400FBE87A /* Release (GC dual-mode) */ = {
+ isa = XCBuildConfiguration;
+ baseConfigurationReference = CE1AB1050E2297C500FBE87A
/* SkimNotes-ReleaseGCSupport.xcconfig */;
+ buildSettings = {
+ ALWAYS_SEARCH_USER_PATHS = NO;
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ GCC_MODEL_TUNING = G5;
+ INSTALL_PATH = /usr/local/bin;
+ OTHER_LDFLAGS = "";
+ PREBINDING = NO;
+ PRODUCT_NAME = skimnotes;
+ };
+ name = "Release (GC dual-mode)";
+ };
+ CE1AB1030E22971400FBE87A /* Release (GC dual-mode) */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ PRODUCT_NAME = HeaderDocs;
+ ZERO_LINK = NO;
+ };
+ name = "Release (GC dual-mode)";
+ };
+ CE1AB1040E22971400FBE87A /* Release (GC dual-mode) */ = {
+ isa = XCBuildConfiguration;
+ buildSettings = {
+ COPY_PHASE_STRIP = YES;
+ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ GCC_ENABLE_FIX_AND_CONTINUE = NO;
+ PRODUCT_NAME = Archive;
+ ZERO_LINK = NO;
+ };
+ name = "Release (GC dual-mode)";
+ };
CE665A860E1C086F00D0704D /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
@@ -532,16 +595,15 @@
};
CEBA2B570E0566B30000B2E6 /* Debug */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = CEBA307A0E06DC680000B2E6
/* SkimNotes-Debug.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(NATIVE_ARCH)";
- COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
INSTALL_PATH = /usr/local/bin;
- MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_LDFLAGS = "";
PREBINDING = NO;
PRODUCT_NAME = skimnotes;
@@ -550,22 +612,15 @@
};
CEBA2B580E0566B30000B2E6 /* Release */ = {
isa = XCBuildConfiguration;
+ baseConfigurationReference = CEBA307D0E06DC950000B2E6
/* SkimNotes-Release.xcconfig */;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- ARCHS = (
- ppc,
- i386,
- );
- COPY_PHASE_STRIP = YES;
- DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_MODEL_TUNING = G5;
INSTALL_PATH = /usr/local/bin;
- MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_LDFLAGS = "";
PREBINDING = NO;
PRODUCT_NAME = skimnotes;
- ZERO_LINK = NO;
};
name = Release;
};
@@ -598,6 +653,7 @@
buildConfigurations = (
1DEB91AE08733DA50010E9CD /* Debug */,
1DEB91AF08733DA50010E9CD /* Release */,
+ CE1AB1010E22971400FBE87A /* Release (GC
dual-mode) */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -607,6 +663,7 @@
buildConfigurations = (
1DEB91B208733DA50010E9CD /* Debug */,
1DEB91B308733DA50010E9CD /* Release */,
+ CE1AB1000E22971400FBE87A /* Release (GC
dual-mode) */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -616,6 +673,7 @@
buildConfigurations = (
CE665A860E1C086F00D0704D /* Debug */,
CE665A870E1C086F00D0704D /* Release */,
+ CE1AB1030E22971400FBE87A /* Release (GC
dual-mode) */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -625,6 +683,7 @@
buildConfigurations = (
CEBA2B570E0566B30000B2E6 /* Debug */,
CEBA2B580E0566B30000B2E6 /* Release */,
+ CE1AB1020E22971400FBE87A /* Release (GC
dual-mode) */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
@@ -634,6 +693,7 @@
buildConfigurations = (
CEBA2EA30E0673B60000B2E6 /* Debug */,
CEBA2EA40E0673B60000B2E6 /* Release */,
+ CE1AB1040E22971400FBE87A /* Release (GC
dual-mode) */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
Modified: trunk/SkimNotes/SkimNotes_Prefix.pch
===================================================================
--- trunk/SkimNotes/SkimNotes_Prefix.pch 2008-07-07 17:05:56 UTC (rev
4142)
+++ trunk/SkimNotes/SkimNotes_Prefix.pch 2008-07-07 19:22:54 UTC (rev
4143)
@@ -7,4 +7,30 @@
#import <Quartz/Quartz.h>
#define SKNLocalizedString(key, comment)
NSLocalizedStringFromTableInBundle(key, @"SkimNotes", [NSBundle
bundleWithIdentifier:@"net.sourceforge.skim-app.framework.skimnotes"], comment)
+
+ #if !defined(MAC_OS_X_VERSION_10_5) || MAC_OS_X_VERSION_MAX_ALLOWED <
MAC_OS_X_VERSION_10_5
+
+ #ifndef NSINTEGER_DEFINED
+ #ifdef NS_BUILD_32_LIKE_64
+ typedef long NSInteger;
+ typedef unsigned long NSUInteger;
+ #else
+ typedef int NSInteger;
+ typedef unsigned int NSUInteger;
+ #endif
+ #define NSIntegerMax LONG_MAX
+ #define NSIntegerMin LONG_MIN
+ #define NSUIntegerMax ULONG_MAX
+ #define NSINTEGER_DEFINED 1
+ #endif
+ typedef NSInteger PDFMarkupType;
+ #define SKNUnsignedIntegerValue(number) [number unsignedIntValue]
+ #define SKNNumberWithUnsignedInteger(value) [NSNumber
numberWithUnsignedInt:value]
+
+ #else
+
+ #define SKNUnsignedIntegerValue(number) ([number
respondsToSelector:@selector(unsignedIntegerValue)] ? [number
unsignedIntegerValue] : [number unsignedIntValue])
+ #define SKNNumberWithUnsignedInteger(value) ([NSNumber
respondsToSelector:@selector(numberWithUnsignedInteger:)] ? [NSNumber
numberWithUnsignedInteger:value] : [NSNumber numberWithUnsignedInt:value])
+
+ #endif
#endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
