Skip to content

Commit

Permalink
Update Xcode project generator (#1732)
Browse files Browse the repository at this point in the history
* Do not build breakpad in Xcode project, fix `PhaseScriptExecution failed` error and fix Flycast cannot be launched from debugger

* NSLog prettyprint for Xcode 16
  • Loading branch information
vkedwardli authored Nov 14, 2024
1 parent 1e30f48 commit 42ad553
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion shell/apple/emulator-osx/emulator-osx/osx-main.mm
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ int darw_printf(const char* text, ...)

NSString* log = [NSString stringWithCString:temp encoding: NSUTF8StringEncoding];
NSDictionary<NSString *, NSString *>* 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
{
Expand Down
2 changes: 1 addition & 1 deletion shell/apple/generate_xcode_project.command
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 42ad553

Please sign in to comment.