diff --git a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj index fc8eb26c..9c8bd000 100644 --- a/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj +++ b/BasiliskII/src/MacOSX/BasiliskII.xcodeproj/project.pbxproj @@ -1375,11 +1375,13 @@ INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.7; + ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = ""; PRECOMPS_INCLUDE_HEADERS_FROM_BUILT_PRODUCTS_DIR = NO; PRODUCT_BUNDLE_IDENTIFIER = com.basiliskii.BasiliskII; PRODUCT_NAME = "$(TARGET_NAME)"; USE_HEADERMAP = YES; + VALID_ARCHS = x86_64; WARNING_CFLAGS = ""; }; name = Debug; @@ -1430,6 +1432,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.basiliskii.BasiliskII; PRODUCT_NAME = "$(TARGET_NAME)"; USE_HEADERMAP = YES; + VALID_ARCHS = x86_64; WARNING_CFLAGS = ""; }; name = Release; diff --git a/BasiliskII/src/MacOSX/utils_macosx.mm b/BasiliskII/src/MacOSX/utils_macosx.mm index 2cfbd8d7..c68d2115 100644 --- a/BasiliskII/src/MacOSX/utils_macosx.mm +++ b/BasiliskII/src/MacOSX/utils_macosx.mm @@ -45,6 +45,10 @@ void disable_SDL2_macosx_menu_bar_keyboard_shortcuts() { sub_item.keyEquivalentModifierMask = 0; } } + if ([menu_item.title isEqualToString:@"View"]) { + [[NSApp mainMenu] removeItem:menu_item]; + break; + } } } diff --git a/SheepShaver/src/MacOSX/Info.plist.in b/SheepShaver/src/MacOSX/Info.plist.in index 1324ba8b..73791ccb 100644 --- a/SheepShaver/src/MacOSX/Info.plist.in +++ b/SheepShaver/src/MacOSX/Info.plist.in @@ -39,18 +39,12 @@ LSArchitecturePriority - i386 x86_64 - ppc LSMinimumSystemVersionByArchitecture - i386 - 10.4.0 x86_64 - 10.6.0 - ppc - 10.4.0 + 10.7.0 diff --git a/SheepShaver/src/Unix/main_unix.cpp b/SheepShaver/src/Unix/main_unix.cpp index 4f025563..74f81836 100755 --- a/SheepShaver/src/Unix/main_unix.cpp +++ b/SheepShaver/src/Unix/main_unix.cpp @@ -705,7 +705,8 @@ static bool init_sdl() atexit(SDL_Quit); #if SDL_VERSION_ATLEAST(2,0,0) - for (int i = 0; i < 100; i++) { + const int SDL_EVENT_TIMEOUT = 100; + for (int i = 0; i < SDL_EVENT_TIMEOUT; i++) { SDL_Event event; SDL_PollEvent(&event); if (event.type == SDL_DROPFILE) {