From f7d732bc3d45cf0d947c3378d64dbd503d5f98b4 Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 2 Jun 2015 09:48:02 +0200 Subject: [PATCH] Rename RetroArch_OSX --- README.md | 10 +++++----- ui/drivers/cocoa/cocoa_common.h | 2 +- ui/drivers/ui_cocoa.m | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index c22b484fb7..7b8fa5c1ab 100644 --- a/README.md +++ b/README.md @@ -123,20 +123,20 @@ make Mac
- Prerequisites: [XCode](https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=1&cad=rja&uact=8&ved=0CB4QFjAA&url=https%3A%2F%2Fitunes.apple.com%2Fus%2Fapp%2Fxcode%2Fid497799835%3Fmt%3D12&ei=ZmfeVNPtIILVoASBnoCYBw&usg=AFQjCNGrxKmVtXUdvUU3MhqZhP4MHT6Gtg&sig2=RIXKsWQ79YTQBt_lK5fdKA&bvm=bv.85970519,d.cGU), [Cg](https://developer.nvidia.com/cg-toolkit-download). -- You can open the project (**apple/RetroArch_OSX.xcodeproj**) in the Xcode IDE and build (**⌘-B**) and run (**⌘-R**) it there. Or you can use the command line... +- You can open the project (**apple/RetroArch.xcodeproj**) in the Xcode IDE and build (**⌘-B**) and run (**⌘-R**) it there. Or you can use the command line... - Debug: ```bash # Build -xcodebuild -target RetroArch_OSX -configuration Debug -project apple/RetroArch_OSX.xcodeproj +xcodebuild -target RetroArch -configuration Debug -project apple/RetroArch.xcodeproj # Run -open ./apple/build/Debug/RetroArch_OSX.app/ +open ./apple/build/Debug/RetroArch.app/ ``` - Release: ```bash # Build -xcodebuild -target RetroArch_OSX -configuration Release -project apple/RetroArch_OSX.xcodeproj +xcodebuild -target RetroArch -configuration Release -project apple/RetroArch.xcodeproj # Run -open ./apple/build/Release/RetroArch_OSX.app/ +open ./apple/build/Release/RetroArch.app/ ``` PC
diff --git a/ui/drivers/cocoa/cocoa_common.h b/ui/drivers/cocoa/cocoa_common.h index 3f45917881..29c6091036 100644 --- a/ui/drivers/cocoa/cocoa_common.h +++ b/ui/drivers/cocoa/cocoa_common.h @@ -98,7 +98,7 @@ void get_ios_version(int *major, int *minor); @end -@interface RetroArch_OSX : NSObject +@interface RetroArch : NSObject { NSWindow* _window; } diff --git a/ui/drivers/ui_cocoa.m b/ui/drivers/ui_cocoa.m index 6d2fdfe8c8..7028e4a020 100644 --- a/ui/drivers/ui_cocoa.m +++ b/ui/drivers/ui_cocoa.m @@ -142,7 +142,7 @@ void apple_rarch_exited(void) static int waiting_argc; static char** waiting_argv; -@implementation RetroArch_OSX +@implementation RetroArch @synthesize window = _window; @@ -395,7 +395,7 @@ void apple_display_alert(const char *message, const char *title) [alert setMessageText:(*title) ? BOXSTRING(title) : BOXSTRING("RetroArch")]; [alert setInformativeText:BOXSTRING(message)]; [alert setAlertStyle:NSInformationalAlertStyle]; - [alert beginSheetModalForWindow:((RetroArch_OSX*)[[NSApplication sharedApplication] delegate]).window + [alert beginSheetModalForWindow:((RetroArch*)[[NSApplication sharedApplication] delegate]).window modalDelegate:apple_platform didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:nil];