(Apple) Header buildfixes

This commit is contained in:
twinaphex 2019-02-09 04:28:06 +01:00
parent b90a9ad4af
commit f64f598987
3 changed files with 17 additions and 24 deletions

View File

@ -17,22 +17,9 @@
#ifndef __COCOA_COMMON_H
#define __COCOA_COMMON_H
#include <Foundation/Foundation.h>
#ifdef HAVE_MENU
#include "../../menu/menu_setting.h"
#include "../../menu/menu_driver.h"
#endif
#if defined(HAVE_COCOATOUCH)
#include <UIKit/UIKit.h>
#if TARGET_OS_TV
#import <GameController/GameController.h>
#endif
#include "cocoa_common_shared.h"
#if defined(HAVE_COCOATOUCH)
#if TARGET_OS_IOS
@interface CocoaView : UIViewController<CLLocationManagerDelegate,
AVCaptureAudioDataOutputSampleBufferDelegate>
@ -65,5 +52,4 @@ void get_ios_version(int *major, int *minor);
#endif
#endif

View File

@ -17,13 +17,6 @@
#ifndef __COCOA_COMMON_METAL_H
#define __COCOA_COMMON_METAL_H
#include <Foundation/Foundation.h>
#ifdef HAVE_MENU
#include "../../menu/menu_setting.h"
#include "../../menu/menu_driver.h"
#endif
#include "cocoa_common_shared.h"
typedef enum apple_view_type {
@ -67,8 +60,6 @@ typedef enum apple_view_type {
extern id<ApplePlatform> apple_platform;
#if defined(HAVE_COCOATOUCH)
#include <UIKit/UIKit.h>
@interface CocoaView : UIViewController<CLLocationManagerDelegate,
AVCaptureAudioDataOutputSampleBufferDelegate>
+ (CocoaView*)get;

View File

@ -17,6 +17,20 @@
#ifndef __COCOA_COMMON_SHARED_H
#define __COCOA_COMMON_SHARED_H
#include <Foundation/Foundation.h>
#ifdef HAVE_MENU
#include "../../menu/menu_setting.h"
#include "../../menu/menu_driver.h"
#endif
#if defined(HAVE_COCOATOUCH)
#include <UIKit/UIKit.h>
#if TARGET_OS_TV
#import <GameController/GameController.h>
#endif
/*********************************************/
/* RAMenuBase */
/* A menu class that displays RAMenuItemBase */
@ -33,6 +47,8 @@
@end
#endif
typedef struct
{
char orientations[32];