(Apple) Combine some header files

apple/OSX/platform.h

@@ -1,57 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2015 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RARCH_OSX_PLATFORM_H
-#define __RARCH_OSX_PLATFORM_H
-
-#include <AppKit/AppKit.h>
-#ifdef HAVE_LOCATION
-#include <CoreLocation/CoreLocation.h>
-#endif
-
-#include "../common/CFExtensions.h"
-
-@interface RAGameView : NSView
-#ifdef HAVE_LOCATION
-<CLLocationManagerDelegate>
-#endif
-
-+ (RAGameView*)get;
-#ifndef OSX
-- (void)display;
-#endif
-
-@end
-
-@interface RetroArch_OSX : NSObject<RetroArch_Platform>
-{
-   NSWindow* _window;
-   NSWindowController* _settingsWindow;
-   NSWindow* _coreSelectSheet;
-   NSString* _file;
-   NSString* _core;
-}
-
-@property (nonatomic, retain) NSWindow IBOutlet* window;
-
-+ (RetroArch_OSX*)get;
-
-- (void)loadingCore:(NSString*)core withFile:(const char*)file;
-- (void)unloadingCore;
-
-@end
-
-#endif

apple/OSX/platform.m

@@ -353,7 +353,6 @@ static void poll_iteration(void)
       event_command(EVENT_CMD_QUIT);
 }
 
-#pragma mark RetroArch_Platform
 - (void)loadingCore:(const NSString*)core withFile:(const char*)file
 {
    if (file)
@@ -365,7 +364,6 @@ static void poll_iteration(void)
    [[NSApplication sharedApplication] terminate:nil];
 }
 
-#pragma mark Menus
 - (IBAction)showCoresDirectory:(id)sender
 {
    settings_t *settings = config_get_ptr();

apple/common/RetroArch_Apple.h

@@ -30,9 +30,79 @@
 
 #ifdef IOS
 #include <UIKit/UIKit.h>
-#import "../iOS/platform.h"
+
+#include <CoreLocation/CoreLocation.h>
+#import <AVFoundation/AVCaptureOutput.h>
+#include "views.h"
+
+typedef struct
+{
+   char orientations[32];
+   unsigned orientation_flags;
+   char bluetooth_mode[64];
+} apple_frontend_settings_t;
+extern apple_frontend_settings_t apple_frontend_settings;
+
+@interface RAGameView : UIViewController<CLLocationManagerDelegate, AVCaptureAudioDataOutputSampleBufferDelegate>
++ (RAGameView*)get;
+@end
+
+@interface RetroArch_iOS : UINavigationController<UIApplicationDelegate, UINavigationControllerDelegate, RetroArch_Platform>
+
+@property (nonatomic) UIWindow* window;
+@property (nonatomic) NSString* documentsDirectory; // e.g. /var/mobile/Documents
+
++ (RetroArch_iOS*)get;
+
+- (void)showGameView;
+- (void)toggleUI;
+
+- (void)loadingCore:(NSString*)core withFile:(const char*)file;
+- (void)unloadingCore;
+
+- (void)refreshSystemConfig;
+@end
+
+void get_ios_version(int *major, int *minor);
+
 #elif defined(OSX)
-#import "../OSX/platform.h"
+#include <AppKit/AppKit.h>
+#ifdef HAVE_LOCATION
+#include <CoreLocation/CoreLocation.h>
+#endif
+
+#include "../common/CFExtensions.h"
+
+@interface RAGameView : NSView
+#ifdef HAVE_LOCATION
+<CLLocationManagerDelegate>
+#endif
+
++ (RAGameView*)get;
+#ifndef OSX
+- (void)display;
+#endif
+
+@end
+
+@interface RetroArch_OSX : NSObject<RetroArch_Platform>
+{
+   NSWindow* _window;
+   NSWindowController* _settingsWindow;
+   NSWindow* _coreSelectSheet;
+   NSString* _file;
+   NSString* _core;
+}
+
+@property (nonatomic, retain) NSWindow IBOutlet* window;
+
++ (RetroArch_OSX*)get;
+
+- (void)loadingCore:(NSString*)core withFile:(const char*)file;
+- (void)unloadingCore;
+
+@end
+
 #endif
 
 extern id<RetroArch_Platform> apple_platform;

apple/iOS/platform.h

@@ -1,54 +0,0 @@
-/*  RetroArch - A frontend for libretro.
- *  Copyright (C) 2013-2014 - Jason Fetters
- *  Copyright (C) 2011-2015 - Daniel De Matteis
- * 
- *  RetroArch is free software: you can redistribute it and/or modify it under the terms
- *  of the GNU General Public License as published by the Free Software Found-
- *  ation, either version 3 of the License, or (at your option) any later version.
- *
- *  RetroArch is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
- *  PURPOSE.  See the GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License along with RetroArch.
- *  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __RARCH_IOS_PLATFORM_H
-#define __RARCH_IOS_PLATFORM_H
-
-#include <CoreLocation/CoreLocation.h>
-#import <AVFoundation/AVCaptureOutput.h>
-#include "views.h"
-
-typedef struct
-{
-   char orientations[32];
-   unsigned orientation_flags;
-   char bluetooth_mode[64];
-} apple_frontend_settings_t;
-extern apple_frontend_settings_t apple_frontend_settings;
-
-@interface RAGameView : UIViewController<CLLocationManagerDelegate, AVCaptureAudioDataOutputSampleBufferDelegate>
-+ (RAGameView*)get;
-@end
-
-@interface RetroArch_iOS : UINavigationController<UIApplicationDelegate, UINavigationControllerDelegate, RetroArch_Platform>
-
-@property (nonatomic) UIWindow* window;
-@property (nonatomic) NSString* documentsDirectory; // e.g. /var/mobile/Documents
-
-+ (RetroArch_iOS*)get;
-
-- (void)showGameView;
-- (void)toggleUI;
-
-- (void)loadingCore:(NSString*)core withFile:(const char*)file;
-- (void)unloadingCore;
-
-- (void)refreshSystemConfig;
-@end
-
-void get_ios_version(int *major, int *minor);
-
-#endif

apple/iOS/platform.m

@@ -364,7 +364,6 @@ enum
    cocoa_input_reset_icade_buttons();
    [self setToolbarHidden:![[viewController toolbarItems] count] animated:YES];
    
-   // Workaround to keep frontend settings fresh
    [self refreshSystemConfig];
 }