[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[565] trunk
Brought to you by:
fredm
Menu
▾
▴
[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[565] trunk
|
From: <fr...@us...> - 2008-12-09 12:08:38
|
Revision: 565
http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=565&view=rev
Author: fredm
Date: 2008-12-09 12:08:31 +0000 (Tue, 09 Dec 2008)
Log Message:
-----------
Migrate to XCode 3.1 and set base targets to 10.4. Add x86_64 build of QuickLook
viewer. Remove some warnings and fix sorting of ROMs array in preferences
controller.
Modified Paths:
--------------
trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
trunk/FuseGenerator/LibspectrumSCRExtractor.m
trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
trunk/audiofile/audiofile.xcodeproj/project.pbxproj
trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
trunk/fuse/fusepb/controllers/DebuggerController.m
trunk/fuse/fusepb/controllers/FuseController.m
trunk/fuse/settings.pl
trunk/fuse/utils.c
trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
Modified: trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2008-12-09 12:04:14 UTC (rev 564)
+++ trunk/FuseGenerator/FuseGenerator.xcodeproj/project.pbxproj 2008-12-09 12:08:31 UTC (rev 565)
@@ -472,7 +472,7 @@
"-lz",
);
PRODUCT_NAME = FuseGenerator;
- VALID_ARCHS = "i386 ppc";
+ VALID_ARCHS = "ppc x86_64 i386";
WRAPPER_EXTENSION = qlgenerator;
ZERO_LINK = YES;
};
@@ -496,7 +496,7 @@
"-lz",
);
PRODUCT_NAME = FuseGenerator;
- VALID_ARCHS = "i386 ppc";
+ VALID_ARCHS = "ppc x86_64 i386";
WARNING_CFLAGS = (
"-Wmost",
"-Wno-four-char-constants",
@@ -509,8 +509,11 @@
2CA326230896AD4900168862 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
DEAD_CODE_STRIPPING = YES;
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_VERSION = 4.2;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
@@ -521,12 +524,11 @@
2CA326240896AD4900168862 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "ppc i386 ppc64 x86_64";
DEAD_CODE_STRIPPING = YES;
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_VERSION = 4.2;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
PREBINDING = NO;
Modified: trunk/FuseGenerator/LibspectrumSCRExtractor.m
===================================================================
--- trunk/FuseGenerator/LibspectrumSCRExtractor.m 2008-12-09 12:04:14 UTC (rev 564)
+++ trunk/FuseGenerator/LibspectrumSCRExtractor.m 2008-12-09 12:08:31 UTC (rev 565)
@@ -442,7 +442,7 @@
scr_length );
}
- scrData = [NSData dataWithBytesNoCopy:(const void *)scr_data length:scr_length];
+ scrData = [NSData dataWithBytesNoCopy:(void *)scr_data length:scr_length];
image_type = TYPE_SCR;
}
Modified: trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj
===================================================================
--- trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2008-12-09 12:04:14 UTC (rev 564)
+++ trunk/FuseImporter/FuseImporter.xcodeproj/project.pbxproj 2008-12-09 12:08:31 UTC (rev 565)
@@ -436,10 +436,6 @@
B6B0E2FD08CC65D5001D8411 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
COPY_PHASE_STRIP = NO;
DEBUGGING_SYMBOLS = YES;
FRAMEWORK_SEARCH_PATHS = "";
@@ -461,8 +457,6 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Library/Spotlight;
LIBRARY_STYLE = Bundle;
- MACOSX_DEPLOYMENT_TARGET = 10.4;
- OPTIMIZATION_CFLAGS = "-O0";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
"-lbz2",
@@ -485,10 +479,6 @@
B6B0E2FE08CC65D5001D8411 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = "";
GCC_ENABLE_FIX_AND_CONTINUE = NO;
@@ -501,7 +491,6 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Library/Spotlight;
LIBRARY_STYLE = Bundle;
- MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
"-lbz2",
@@ -524,10 +513,6 @@
B6B0E2FF08CC65D5001D8411 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
FRAMEWORK_SEARCH_PATHS = "";
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = NO;
@@ -538,7 +523,6 @@
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = /Library/Spotlight;
LIBRARY_STYLE = Bundle;
- MACOSX_DEPLOYMENT_TARGET = 10.4;
OTHER_CFLAGS = "";
OTHER_LDFLAGS = (
"-lbz2",
@@ -561,7 +545,10 @@
B6B0E30108CC65D5001D8411 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEBUG_INFORMATION_FORMAT = dwarf;
+ GCC_VERSION = 4.0;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
@@ -569,8 +556,11 @@
B6B0E30208CC65D5001D8411 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
+ GCC_VERSION = 4.0;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
@@ -578,7 +568,10 @@
B6B0E30308CC65D5001D8411 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEBUG_INFORMATION_FORMAT = dwarf;
+ GCC_VERSION = 4.0;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
Modified: trunk/audiofile/audiofile.xcodeproj/project.pbxproj
===================================================================
--- trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2008-12-09 12:04:14 UTC (rev 564)
+++ trunk/audiofile/audiofile.xcodeproj/project.pbxproj 2008-12-09 12:08:31 UTC (rev 565)
@@ -134,7 +134,7 @@
000000000000000016620A20 /* units.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = units.h; sourceTree = "<group>"; };
000000000000000016620B50 /* util.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = util.h; sourceTree = "<group>"; };
000000000000000016620BD0 /* wave.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = wave.h; sourceTree = "<group>"; };
- B62395C00C1CF586003B8E87 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
+ B62395C00C1CF586003B8E87 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
B62395C10C1CF586003B8E87 /* audiofile.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = audiofile.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B62395C80C1CF5AC003B8E87 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
@@ -303,9 +303,11 @@
000000000000000016601A90 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = B62395470C1CF4F8003B8E87 /* Build configuration list for PBXProject "audiofile" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 0000000000000000166142F0;
projectDirPath = "";
+ projectRoot = "";
targets = (
B623958A0C1CF586003B8E87 /* audiofile Framework */,
);
@@ -390,13 +392,12 @@
B62395480C1CF4F8003B8E87 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = NO;
FRAMEWORK_VERSION = 0.2.6;
+ GCC_VERSION = 4.0;
MACOSX_DEPLOYMENT_TARGET = 10.4;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
@@ -405,13 +406,12 @@
B62395490C1CF4F8003B8E87 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
FRAMEWORK_VERSION = 0.2.6;
+ GCC_VERSION = 4.0;
MACOSX_DEPLOYMENT_TARGET = 10.4;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
@@ -420,13 +420,12 @@
B623954A0C1CF4F8003B8E87 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = NO;
FRAMEWORK_VERSION = 0.2.6;
+ GCC_VERSION = 4.0;
MACOSX_DEPLOYMENT_TARGET = 10.4;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
@@ -435,6 +434,8 @@
B62395BD0C1CF586003B8E87 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
COPY_PHASE_STRIP = NO;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1.2;
@@ -460,11 +461,10 @@
OTHER_LDFLAGS = (
"-lm",
"-lc",
- "-seg1addr",
- 0x27000000,
);
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
+ PREBINDING = NO;
PRINCIPAL_CLASS = "";
PRODUCT_NAME = audiofile;
SECTORDER_FLAGS = "";
@@ -477,6 +477,8 @@
B62395BE0C1CF586003B8E87 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
COPY_PHASE_STRIP = YES;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1.2;
@@ -501,11 +503,10 @@
OTHER_LDFLAGS = (
"-lm",
"-lc",
- "-seg1addr",
- 0x27000000,
);
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
+ PREBINDING = NO;
PRINCIPAL_CLASS = "";
PRODUCT_NAME = audiofile;
SECTORDER_FLAGS = "";
@@ -518,6 +519,8 @@
B62395BF0C1CF586003B8E87 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1.2;
FRAMEWORK_VERSION = 0.2.6;
@@ -540,11 +543,10 @@
OTHER_LDFLAGS = (
"-lm",
"-lc",
- "-seg1addr",
- 0x27000000,
);
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
+ PREBINDING = NO;
PRINCIPAL_CLASS = "";
PRODUCT_NAME = audiofile;
SECTORDER_FLAGS = "";
Modified: trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj
===================================================================
--- trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2008-12-09 12:04:14 UTC (rev 564)
+++ trunk/fuse/fusepb/Fuse.xcodeproj/project.pbxproj 2008-12-09 12:08:31 UTC (rev 565)
@@ -314,7 +314,7 @@
B615BFE60B4261E50082D535 /* HIDJoysticks.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = HIDJoysticks.m; path = content_arrays/HIDJoysticks.m; sourceTree = "<group>"; };
B619FC2E090D9BC200344F94 /* SavePanelAccessoryView.nib */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = SavePanelAccessoryView.nib; path = nibs/SavePanelAccessoryView.nib; sourceTree = "<group>"; };
B61EEB950D1A917D006FEA80 /* FuseGenerator.qlgenerator */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.bundle"; name = FuseGenerator.qlgenerator; path = ../../FuseGenerator/build/Release/FuseGenerator.qlgenerator; sourceTree = SOURCE_ROOT; };
- B61F46A909121DF100C8096C /* Info-Fuse.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-Fuse.plist"; sourceTree = "<group>"; };
+ B61F46A909121DF100C8096C /* Info-Fuse.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-Fuse.plist"; sourceTree = "<group>"; };
B61F46AA09121DF200C8096C /* Fuse.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Fuse.app; sourceTree = BUILT_PRODUCTS_DIR; };
B621A11E062E92FB00F63DBC /* if2.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = if2.c; path = ../if2.c; sourceTree = SOURCE_ROOT; };
B621A11F062E92FB00F63DBC /* if2.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = if2.h; path = ../if2.h; sourceTree = SOURCE_ROOT; };
@@ -1268,9 +1268,11 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
buildConfigurationList = B63319B3086803BA00732AA3 /* Build configuration list for PBXProject "Fuse" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 29B97314FDCFA39411CA2CEA /* Fuse */;
projectDirPath = "";
+ projectRoot = "";
targets = (
B61F459009121DF100C8096C /* Fuse */,
);
@@ -1515,10 +1517,6 @@
B61F46A609121DF100C8096C /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
COPY_PHASE_STRIP = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(HOME)/Library/Frameworks",
@@ -1558,10 +1556,6 @@
B61F46A709121DF100C8096C /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
COPY_PHASE_STRIP = YES;
FRAMEWORK_SEARCH_PATHS = (
"$(HOME)/Library/Frameworks",
@@ -1600,10 +1594,6 @@
B61F46A809121DF100C8096C /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- ppc,
- i386,
- );
FRAMEWORK_SEARCH_PATHS = (
"$(HOME)/Library/Frameworks",
../../libspectrum/build/Deployment,
@@ -1641,13 +1631,13 @@
B63319B4086803BA00732AA3 /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
+ GCC_AUTO_VECTORIZATION = NO;
GCC_DYNAMIC_NO_PIC = YES;
+ GCC_VERSION = 4.0;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
YACCFLAGS = "-d";
@@ -1659,14 +1649,14 @@
B63319B5086803BA00732AA3 /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
+ GCC_AUTO_VECTORIZATION = NO;
GCC_DYNAMIC_NO_PIC = YES;
+ GCC_VERSION = 4.0;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
YACCFLAGS = "-d";
@@ -1678,13 +1668,13 @@
B63319B6086803BA00732AA3 /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEAD_CODE_STRIPPING = YES;
DEBUG_INFORMATION_FORMAT = dwarf;
+ GCC_AUTO_VECTORIZATION = NO;
GCC_DYNAMIC_NO_PIC = YES;
+ GCC_VERSION = 4.0;
GCC_WARN_ABOUT_POINTER_SIGNEDNESS = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
YACCFLAGS = "-d";
Modified: trunk/fuse/fusepb/controllers/DebuggerController.m
===================================================================
--- trunk/fuse/fusepb/controllers/DebuggerController.m 2008-12-09 12:04:14 UTC (rev 564)
+++ trunk/fuse/fusepb/controllers/DebuggerController.m 2008-12-09 12:08:31 UTC (rev 565)
@@ -482,7 +482,7 @@
- (IBAction)debugger_cmd_evaluate:(id)sender
{
- debugger_command_evaluate( [[entry stringValue] lossyCString] );
+ debugger_command_evaluate( [[entry stringValue] UTF8String] );
}
- (IBAction)debugger_done_step:(id)sender
Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m 2008-12-09 12:04:14 UTC (rev 564)
+++ trunk/fuse/fusepb/controllers/FuseController.m 2008-12-09 12:08:31 UTC (rev 565)
@@ -963,13 +963,13 @@
NSPoint point;
event1 = [NSEvent keyEventWithType:NSKeyUp location:point modifierFlags:0
- timestamp:nil windowNumber:0 context:nil characters:character
+ timestamp:0 windowNumber:0 context:nil characters:character
charactersIgnoringModifiers:character isARepeat:NO
keyCode:keyCode];
[NSApp postEvent:event1 atStart:NO];
event2 = [NSEvent keyEventWithType:NSFlagsChanged location:point
- modifierFlags:0 timestamp:nil windowNumber:0 context:nil
+ modifierFlags:0 timestamp:0 windowNumber:0 context:nil
characters:nil charactersIgnoringModifiers:nil isARepeat:NO
keyCode:0];
[NSApp postEvent:event2 atStart:NO];
@@ -991,7 +991,7 @@
NSPoint point;
event1 = [NSEvent keyEventWithType:NSKeyUp location:point modifierFlags:0
- timestamp:nil windowNumber:0 context:nil characters:@" "
+ timestamp:0 windowNumber:0 context:nil characters:@" "
charactersIgnoringModifiers:@" " isARepeat:NO keyCode:keyCode];
[NSApp postEvent:event1 atStart:NO];
}
@@ -1276,7 +1276,7 @@
@"Stop Recording"];
}
-- (BOOL)validateMenuItem:(id <NSMenuItem>)menuItem
+- (BOOL)validateMenuItem:(NSMenuItem*)menuItem
{
switch( [menuItem tag] ) {
case 1:
Modified: trunk/fuse/settings.pl
===================================================================
--- trunk/fuse/settings.pl 2008-12-09 12:04:14 UTC (rev 564)
+++ trunk/fuse/settings.pl 2008-12-09 12:08:31 UTC (rev 565)
@@ -607,6 +607,24 @@
print hashline( __LINE__ ), << 'CODE';
+/* Comparison function to sort the machineroms array */
+int
+machineroms_compare( id dict1, id dict2, void *context )
+{
+ NSMutableDictionary *roms1 = (NSMutableDictionary*)dict1;
+ NSMutableDictionary *roms2 = (NSMutableDictionary*)dict2;
+ int index1 = machine_get_index( [[roms1 valueForKey:@"machine"] machineType] );
+ int index2 = machine_get_index( [[roms2 valueForKey:@"machine"] machineType] );
+ int retval = NSOrderedSame;
+ if( index1 > index2 ) {
+ retval = NSOrderedDescending;
+ } else if( index1 < index2 ) {
+ retval = NSOrderedAscending;
+ }
+
+ return retval;
+}
+
/* Fill a NSMutableArray with rom information suitable for use with Cocoa
bindings */
NSMutableArray*
@@ -642,14 +660,8 @@
print hashline( __LINE__ ), << 'CODE';
/* We assume that we got all machines in the array, this should always be
true*/
- NSEnumerator *enumerator = [machineroms objectEnumerator];
- while ( ( roms = [enumerator nextObject] ) ) {
- int index = machine_get_index( [[roms valueForKey:@"machine"] machineType] );
- int i = [machineroms indexOfObject:roms];
- if( i != index ) {
- [machineroms exchangeObjectAtIndex:i withObjectAtIndex:index];
- }
- }
+ [machineroms sortUsingFunction:machineroms_compare context:nil];
+
return machineroms;
}
CODE
Modified: trunk/fuse/utils.c
===================================================================
--- trunk/fuse/utils.c 2008-12-09 12:04:14 UTC (rev 564)
+++ trunk/fuse/utils.c 2008-12-09 12:08:31 UTC (rev 565)
@@ -253,7 +253,7 @@
resource_url, file, false);
if (file_url == NULL) goto deallocate;
- if (!CFURLGetFileSystemRepresentation (file_url, TRUE, path,
+ if (!CFURLGetFileSystemRepresentation (file_url, TRUE, (unsigned char*)path,
PATH_MAX)) goto deallocate;
deallocate:
Modified: trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj
===================================================================
--- trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj 2008-12-09 12:04:14 UTC (rev 564)
+++ trunk/libgcrypt/libgcrypt.xcodeproj/project.pbxproj 2008-12-09 12:08:31 UTC (rev 565)
@@ -138,7 +138,7 @@
000000000000000016430580 /* mpi-inv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = "mpi-inv.c"; sourceTree = "<group>"; };
000000000000000016430A90 /* dsa.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = dsa.c; sourceTree = "<group>"; };
000000000000000016430DB0 /* module.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = module.c; sourceTree = "<group>"; };
- B61D2B3C0A59ED5F0008B6CC /* Info-gcrypt.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = "Info-gcrypt.plist"; sourceTree = "<group>"; };
+ B61D2B3C0A59ED5F0008B6CC /* Info-gcrypt.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info-gcrypt.plist"; sourceTree = "<group>"; };
B61D2B3D0A59ED5F0008B6CC /* gcrypt.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = gcrypt.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B69AFF390A5BFD0F00EEA5ED /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = config.h; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
@@ -357,9 +357,11 @@
00000000000000001640F4D0 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = B61D2B3F0A59ED600008B6CC /* Build configuration list for PBXProject "libgcrypt" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 00000000000000001640F560;
projectDirPath = "";
+ projectRoot = "";
targets = (
B61D2B040A59ED5F0008B6CC /* gcrypt Framework */,
);
@@ -467,9 +469,9 @@
);
INFOPLIST_FILE = "Info-gcrypt.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.3;
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
+ PREBINDING = NO;
PRINCIPAL_CLASS = "";
PRODUCT_NAME = gcrypt;
SECTORDER_FLAGS = "";
@@ -502,9 +504,9 @@
);
INFOPLIST_FILE = "Info-gcrypt.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.3;
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
+ PREBINDING = NO;
PRINCIPAL_CLASS = "";
PRODUCT_NAME = gcrypt;
SECTORDER_FLAGS = "";
@@ -535,9 +537,9 @@
);
INFOPLIST_FILE = "Info-gcrypt.plist";
INSTALL_PATH = "@executable_path/../Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.3;
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
+ PREBINDING = NO;
PRINCIPAL_CLASS = "";
PRODUCT_NAME = gcrypt;
SECTORDER_FLAGS = "";
@@ -549,11 +551,11 @@
B61D2B400A59ED600008B6CC /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEBUG_INFORMATION_FORMAT = dwarf;
+ GCC_VERSION = 4.0;
+ PREBINDING = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
@@ -561,12 +563,12 @@
B61D2B410A59ED600008B6CC /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
+ GCC_VERSION = 4.0;
+ PREBINDING = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
@@ -574,11 +576,11 @@
B61D2B420A59ED600008B6CC /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEBUG_INFORMATION_FORMAT = dwarf;
+ GCC_VERSION = 4.0;
+ PREBINDING = NO;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
Modified: trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj
===================================================================
--- trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj 2008-12-09 12:04:14 UTC (rev 564)
+++ trunk/libspectrum/libspectrum.xcodeproj/project.pbxproj 2008-12-09 12:08:31 UTC (rev 565)
@@ -123,7 +123,7 @@
B67099A00A6B4EA700CA951F /* z80em.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = z80em.c; sourceTree = "<group>"; };
B6BF2A9A0A60023100D16624 /* libspectrum.h.in */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = libspectrum.h.in; sourceTree = "<group>"; };
B6BF2AA40A6005E800D16624 /* libspectrum.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = libspectrum.h; sourceTree = SOURCE_ROOT; };
- B6CBAD780A5F3C2900F826D6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.xml; path = Info.plist; sourceTree = "<group>"; };
+ B6CBAD780A5F3C2900F826D6 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
B6CBAD790A5F3C2900F826D6 /* spectrum.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = spectrum.framework; sourceTree = BUILT_PRODUCTS_DIR; };
B6CBADB70A5F3F3400F826D6 /* gcrypt.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = gcrypt.framework; path = ../libgcrypt/build/Deployment/gcrypt.framework; sourceTree = SOURCE_ROOT; };
B6CBAE200A5FDDC700F826D6 /* snap_accessors.txt */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text; path = snap_accessors.txt; sourceTree = "<group>"; };
@@ -275,9 +275,11 @@
000000000000000016410950 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = B69A010D0A5F3BF500EEA5ED /* Build configuration list for PBXProject "libspectrum" */;
+ compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 1;
mainGroup = 0000000000000000164109E0;
projectDirPath = "";
+ projectRoot = "";
targets = (
B6CBAD510A5F3C2900F826D6 /* spectrum Framework */,
);
@@ -353,11 +355,10 @@
B69A010E0A5F3BF500EEA5ED /* Development */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEBUG_INFORMATION_FORMAT = dwarf;
+ GCC_VERSION = 4.0;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Development;
@@ -365,12 +366,11 @@
B69A010F0A5F3BF500EEA5ED /* Deployment */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEBUG_INFORMATION_FORMAT = dwarf;
DEPLOYMENT_POSTPROCESSING = YES;
+ GCC_VERSION = 4.0;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Deployment;
@@ -378,11 +378,10 @@
B69A01100A5F3BF500EEA5ED /* Default */ = {
isa = XCBuildConfiguration;
buildSettings = {
- ARCHS = (
- i386,
- ppc,
- );
+ ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)";
+ ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386";
DEBUG_INFORMATION_FORMAT = dwarf;
+ GCC_VERSION = 4.0;
SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk;
};
name = Default;
@@ -425,11 +424,10 @@
OTHER_LDFLAGS = (
"-lbz2",
"-lz",
- "-seg1addr",
- 0x10000000,
);
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
+ PREBINDING = NO;
PRINCIPAL_CLASS = "";
PRODUCT_NAME = spectrum;
SECTORDER_FLAGS = "";
@@ -476,11 +474,10 @@
OTHER_LDFLAGS = (
"-lbz2",
"-lz",
- "-seg1addr",
- 0x10000000,
);
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
+ PREBINDING = NO;
PRINCIPAL_CLASS = "";
PRODUCT_NAME = spectrum;
SECTORDER_FLAGS = "";
@@ -525,11 +522,10 @@
OTHER_LDFLAGS = (
"-lbz2",
"-lz",
- "-seg1addr",
- 0x10000000,
);
OTHER_LIBTOOL_FLAGS = "";
OTHER_REZFLAGS = "";
+ PREBINDING = NO;
PRINCIPAL_CLASS = "";
PRODUCT_NAME = spectrum;
SECTORDER_FLAGS = "";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
