From a18ecb854914525266ac7c85a855b010cdff680b Mon Sep 17 00:00:00 2001 From: Alexei Svitkine Date: Mon, 29 Jun 2015 12:54:51 -0400 Subject: [PATCH] Fix SheepShaver Launcher build. --- .../project.pbxproj | 42 +++++++++++++++---- .../src/MacOSX/Launcher/VMListController.mm | 21 +++++++--- 2 files changed, 50 insertions(+), 13 deletions(-) diff --git a/SheepShaver/src/MacOSX/Launcher/SheepShaverLauncher.xcodeproj/project.pbxproj b/SheepShaver/src/MacOSX/Launcher/SheepShaverLauncher.xcodeproj/project.pbxproj index 154fb01f..fe382f61 100644 --- a/SheepShaver/src/MacOSX/Launcher/SheepShaverLauncher.xcodeproj/project.pbxproj +++ b/SheepShaver/src/MacOSX/Launcher/SheepShaverLauncher.xcodeproj/project.pbxproj @@ -3,11 +3,12 @@ archiveVersion = 1; classes = { }; - objectVersion = 42; + objectVersion = 46; objects = { /* Begin PBXBuildFile section */ 084186B10B3A0515004B1F63 /* VMSettingsController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 084186B00B3A0515004B1F63 /* VMSettingsController.mm */; }; + 088EBBB61B41AEBB0066D352 /* DiskType.m in Sources */ = {isa = PBXBuildFile; fileRef = 088EBBB51B41AEBB0066D352 /* DiskType.m */; }; 08AAB16D102614D5007E1230 /* SheepShaver.icns in Resources */ = {isa = PBXBuildFile; fileRef = 08AAB16C102614D5007E1230 /* SheepShaver.icns */; }; 08AAB1B310261691007E1230 /* SheepShaver in Copy SheepShaver */ = {isa = PBXBuildFile; fileRef = 08AAB1B11026168B007E1230 /* SheepShaver */; }; 08B5FAFD102497FA0047FD1B /* VMSettingsWindow.nib in Resources */ = {isa = PBXBuildFile; fileRef = 08B5FAFB102497FA0047FD1B /* VMSettingsWindow.nib */; }; @@ -41,6 +42,12 @@ 084186AF0B3A0515004B1F63 /* VMSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = VMSettingsController.h; sourceTree = ""; }; 084186B00B3A0515004B1F63 /* VMSettingsController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = VMSettingsController.mm; sourceTree = ""; }; 085339D612C9874400345D35 /* LauncherPrefix.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LauncherPrefix.h; sourceTree = SOURCE_ROOT; }; + 088EBB6F1B41ABDA0066D352 /* config.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../config/config.h; sourceTree = SOURCE_ROOT; }; + 088EBB701B41ABE40066D352 /* config-macosx-ppc_32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "config-macosx-ppc_32.h"; path = "../config/config-macosx-ppc_32.h"; sourceTree = SOURCE_ROOT; }; + 088EBB711B41ABE40066D352 /* config-macosx-x86_32.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "config-macosx-x86_32.h"; path = "../config/config-macosx-x86_32.h"; sourceTree = SOURCE_ROOT; }; + 088EBB721B41ABE40066D352 /* config-macosx-x86_64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "config-macosx-x86_64.h"; path = "../config/config-macosx-x86_64.h"; sourceTree = SOURCE_ROOT; }; + 088EBBB41B41AEBB0066D352 /* DiskType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiskType.h; sourceTree = SOURCE_ROOT; }; + 088EBBB51B41AEBB0066D352 /* DiskType.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DiskType.m; sourceTree = SOURCE_ROOT; }; 089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = ""; }; 08AAB16C102614D5007E1230 /* SheepShaver.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = SheepShaver.icns; path = ../SheepShaver.icns; sourceTree = SOURCE_ROOT; }; 08AAB1B11026168B007E1230 /* SheepShaver */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = SheepShaver; path = ../../Unix/SheepShaver; sourceTree = SOURCE_ROOT; }; @@ -54,7 +61,6 @@ 08DC90C20B67078300799A45 /* prefs.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = prefs.h; path = ../../include/prefs.h; sourceTree = SOURCE_ROOT; }; 08DC90C40B67079800799A45 /* sys.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sys.h; path = ../../include/sys.h; sourceTree = SOURCE_ROOT; }; 08DC90C50B6707AC00799A45 /* user_strings_unix.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = user_strings_unix.h; path = ../../Unix/user_strings_unix.h; sourceTree = SOURCE_ROOT; }; - 08DC90C60B6707B400799A45 /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../../Unix/config.h; sourceTree = SOURCE_ROOT; }; 08DC90C70B6707BE00799A45 /* sysdeps.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sysdeps.h; path = ../../Unix/sysdeps.h; sourceTree = SOURCE_ROOT; }; 08F4D172102601C500C6436D /* VMListController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VMListController.h; sourceTree = ""; }; 08F4D173102601C500C6436D /* VMListController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = VMListController.mm; sourceTree = ""; }; @@ -120,7 +126,10 @@ 08DC90C20B67078300799A45 /* prefs.h */, 08DC90C40B67079800799A45 /* sys.h */, 08DC90C50B6707AC00799A45 /* user_strings_unix.h */, - 08DC90C60B6707B400799A45 /* config.h */, + 088EBB6F1B41ABDA0066D352 /* config.h */, + 088EBB701B41ABE40066D352 /* config-macosx-ppc_32.h */, + 088EBB711B41ABE40066D352 /* config-macosx-x86_32.h */, + 088EBB721B41ABE40066D352 /* config-macosx-x86_64.h */, 08DC90C70B6707BE00799A45 /* sysdeps.h */, 08DC90BC0B67074C00799A45 /* prefs_items.cpp */, 08DC90BE0B67075D00799A45 /* prefs_unix.cpp */, @@ -132,6 +141,8 @@ 19C28FACFE9D520D11CA2CBB /* Products */, 08B5FB201024FE320047FD1B /* AppController.h */, 08B5FB211024FE320047FD1B /* AppController.mm */, + 088EBBB41B41AEBB0066D352 /* DiskType.h */, + 088EBBB51B41AEBB0066D352 /* DiskType.m */, 084186AF0B3A0515004B1F63 /* VMSettingsController.h */, 084186B00B3A0515004B1F63 /* VMSettingsController.mm */, 08F4D172102601C500C6436D /* VMListController.h */, @@ -199,8 +210,15 @@ 29B97313FDCFA39411CA2CEA /* Project object */ = { isa = PBXProject; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "SheepShaverLauncher" */; - compatibilityVersion = "Xcode 2.4"; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; hasScannedForEncodings = 1; + knownRegions = ( + English, + Japanese, + French, + German, + ); mainGroup = 29B97314FDCFA39411CA2CEA /* SheepShaverLauncher */; projectDirPath = ""; projectRoot = ""; @@ -237,6 +255,7 @@ 08DC90C10B67077300799A45 /* prefs.cpp in Sources */, 08B5FB221024FE320047FD1B /* AppController.mm in Sources */, 08F4D174102601C500C6436D /* VMListController.mm in Sources */, + 088EBBB61B41AEBB0066D352 /* DiskType.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -291,6 +310,7 @@ PREFS_EDITOR, STANDALONE_PREFS, ); + GCC_VERSION = 4.0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; OTHER_CFLAGS = "$(inherited)"; @@ -303,21 +323,29 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; ARCHS = ( ppc, i386, + x86_64, ); - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; + COPY_PHASE_STRIP = NO; + GCC_GENERATE_DEBUGGING_SYMBOLS = YES; GCC_INPUT_FILETYPE = sourcecode.cpp.objcpp; GCC_MODEL_TUNING = G5; GCC_PREPROCESSOR_DEFINITIONS = ( PREFS_EDITOR, STANDALONE_PREFS, ); + GCC_VERSION = 4.0; + "GCC_VERSION[arch=x86_64]" = 4.2; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; + "MACOSX_DEPLOYMENT_TARGET[arch=x86_64]" = 10.5; OTHER_CFLAGS = "$(inherited)"; + PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; PRODUCT_NAME = SheepShaverLauncher; + "SDKROOT[arch=x86_64]" = macosx10.6; WRAPPER_EXTENSION = app; }; name = Release; @@ -328,7 +356,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; }; name = Debug; }; @@ -340,7 +368,7 @@ GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; + SDKROOT = "$(DEVELOPER_SDK_DIR)/MacOSX10.4u.sdk"; }; name = Release; }; diff --git a/SheepShaver/src/MacOSX/Launcher/VMListController.mm b/SheepShaver/src/MacOSX/Launcher/VMListController.mm index 9c6d1d4f..d5b48ab3 100644 --- a/SheepShaver/src/MacOSX/Launcher/VMListController.mm +++ b/SheepShaver/src/MacOSX/Launcher/VMListController.mm @@ -21,6 +21,15 @@ #import "VMListController.h" #import "VMSettingsController.h" +// NSInteger was added in 10.5 SDK. +#if MAC_OS_X_VERSION_MIN_REQUIRED < 1050 + #if __LP64__ || NS_BUILD_32_LIKE_64 + typedef long NSInteger; + #else + typedef int NSInteger; + #endif +#endif + /* TODO: @@ -112,17 +121,17 @@ Copy path! } } -- (int) numberOfRowsInTableView: (NSTableView *) table +- (NSInteger) numberOfRowsInTableView: (NSTableView *) table { return [vmArray count]; } -- (id) tableView: (NSTableView *) table objectValueForTableColumn: (NSTableColumn *) c row: (int) r +- (id) tableView: (NSTableView *) table objectValueForTableColumn: (NSTableColumn *) c row: (NSInteger) r { return [[[vmArray objectAtIndex: r] lastPathComponent] stringByDeletingPathExtension]; } -- (void) tableView: (NSTableView *) table setObjectValue: (id) value forTableColumn: (NSTableColumn *) c row: (int) r +- (void) tableView: (NSTableView *) table setObjectValue: (id) value forTableColumn: (NSTableColumn *) c row: (NSInteger) r { NSString *currentPath = [vmArray objectAtIndex: r]; NSString *newPath = [[NSString stringWithFormat:@"%@/%@.sheepvm", @@ -159,7 +168,7 @@ Copy path! return YES; } -- (NSDragOperation) tableView: (NSTableView *) table validateDrop: (id ) info proposedRow: (int) row proposedDropOperation: (NSTableViewDropOperation) op +- (NSDragOperation) tableView: (NSTableView *) table validateDrop: (id ) info proposedRow: (NSInteger) row proposedDropOperation: (NSTableViewDropOperation) op { if (op == NSTableViewDropAbove && row != -1) { return NSDragOperationPrivate; @@ -168,7 +177,7 @@ Copy path! } } -- (BOOL) tableView: (NSTableView *) table acceptDrop: (id ) info row: (int) row dropOperation: (NSTableViewDropOperation) op +- (BOOL) tableView: (NSTableView *) table acceptDrop: (id ) info row: (NSInteger) row dropOperation: (NSTableViewDropOperation) op { if ([[[info draggingPasteboard] availableTypeFromArray:[NSArray arrayWithObject:VM_DRAG_TYPE]] isEqualToString:VM_DRAG_TYPE]) { [vmList deselectAll:nil]; @@ -210,7 +219,7 @@ Copy path! } - (NSString *) tableView: (NSTableView *) table toolTipForCell: (NSCell *) cell rect: (NSRectPointer) rect - tableColumn: (NSTableColumn *) c row: (int) r mouseLocation: (NSPoint) loc + tableColumn: (NSTableColumn *) c row: (NSInteger) r mouseLocation: (NSPoint) loc { return [vmArray objectAtIndex: r]; }