From 42ad5532b29168340c83214f57f007d77b8ffaf8 Mon Sep 17 00:00:00 2001 From: vkedwardli Date: Thu, 14 Nov 2024 20:15:54 +0800 Subject: [PATCH] Update Xcode project generator (#1732) * Do not build breakpad in Xcode project, fix `PhaseScriptExecution failed` error and fix Flycast cannot be launched from debugger * NSLog prettyprint for Xcode 16 --- shell/apple/emulator-osx/emulator-osx/osx-main.mm | 2 +- shell/apple/generate_xcode_project.command | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/shell/apple/emulator-osx/emulator-osx/osx-main.mm b/shell/apple/emulator-osx/emulator-osx/osx-main.mm index 9a5b0a53b0..8c7c3a7ab7 100644 --- a/shell/apple/emulator-osx/emulator-osx/osx-main.mm +++ b/shell/apple/emulator-osx/emulator-osx/osx-main.mm @@ -35,7 +35,7 @@ int darw_printf(const char* text, ...) NSString* log = [NSString stringWithCString:temp encoding: NSUTF8StringEncoding]; NSDictionary* env = [[NSProcessInfo processInfo] environment]; - static bool isXcode = [env[@"OS_ACTIVITY_DT_MODE"] boolValue] || [env[@"COMMAND_MODE"] isEqualToString:@"unix2003"]; + static bool isXcode = [env[@"OS_ACTIVITY_DT_MODE"] boolValue] || [env[@"COMMAND_MODE"] isEqualToString:@"unix2003"] || [env[@"TERM"] isEqualToString:@"dumb"]; if (isXcode) // Xcode console does not support colors { diff --git a/shell/apple/generate_xcode_project.command b/shell/apple/generate_xcode_project.command index 311c39ef1f..3a992acaa3 100755 --- a/shell/apple/generate_xcode_project.command +++ b/shell/apple/generate_xcode_project.command @@ -31,7 +31,7 @@ if [[ -z "${VULKAN_SDK}" ]]; then fi fi -cmake -B build -DCMAKE_BUILD_TYPE=Release $option -DCMAKE_XCODE_GENERATE_SCHEME=YES -G "Xcode" +cmake -B build -DCMAKE_BUILD_TYPE=Release $option -DUSE_BREAKPAD=NO -DCMAKE_XCODE_GENERATE_SCHEME=YES -G "Xcode" nl=$'\n' /usr/bin/sed -i '' -E "s/launchStyle/customLLDBInitFile = \"\$(SRCROOT)\/shell\/apple\/\\${lldbinitfolder}\/LLDBInitFile\"\\${nl}launchStyle/g" build/flycast.xcodeproj/xcshareddata/xcschemes/flycast.xcscheme