diff options
Diffstat (limited to 'backends/platform/ios7')
17 files changed, 93 insertions, 47 deletions
diff --git a/backends/platform/ios7/iOS7AppDelegate.h b/backends/platform/ios7/iOS7AppDelegate.h deleted file mode 100644 index 7f903a692d..0000000000 --- a/backends/platform/ios7/iOS7AppDelegate.h +++ /dev/null @@ -1,15 +0,0 @@ -// -// Created by Vincent Bénony on 07/12/2015. -// - -#import <UIKit/UIKit.h> - -@class iPhoneView; - - -@interface iOS7AppDelegate : NSObject<UIApplicationDelegate> - -+ (iOS7AppDelegate *)iOS7AppDelegate; -+ (iPhoneView *)iPhoneView; - -@end diff --git a/backends/platform/ios7/ios7_app_delegate.h b/backends/platform/ios7/ios7_app_delegate.h new file mode 100644 index 0000000000..08696c7b61 --- /dev/null +++ b/backends/platform/ios7/ios7_app_delegate.h @@ -0,0 +1,38 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program 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 Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#ifndef BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H +#define BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H + +#include <UIKit/UIKit.h> + +@class iPhoneView; + + +@interface iOS7AppDelegate : NSObject<UIApplicationDelegate> + ++ (iOS7AppDelegate *)iOS7AppDelegate; ++ (iPhoneView *)iPhoneView; + +@end + +#endif diff --git a/backends/platform/ios7/iOS7AppDelegate.mm b/backends/platform/ios7/ios7_app_delegate.mm index e9908ec146..88d0a8925e 100644 --- a/backends/platform/ios7/iOS7AppDelegate.mm +++ b/backends/platform/ios7/ios7_app_delegate.mm @@ -1,11 +1,29 @@ -// -// Created by Vincent Bénony on 07/12/2015. -// +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program 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 Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program 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 this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ #define FORBIDDEN_SYMBOL_ALLOW_ALL -#import "iOS7AppDelegate.h" -#import "iOS7ScummVMViewController.h" -#import "ios7_video.h" +#include "backends/platform/ios7/ios7_app_delegate.h" +#include "backends/platform/ios7/ios7_scummvm_view_controller.h" +#include "backends/platform/ios7/ios7_video.h" @implementation iOS7AppDelegate { UIWindow *_window; diff --git a/backends/platform/ios7/ios7_common.h b/backends/platform/ios7/ios7_common.h index a32a59a541..12740d4ae9 100644 --- a/backends/platform/ios7/ios7_common.h +++ b/backends/platform/ios7/ios7_common.h @@ -20,8 +20,8 @@ * */ -#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_COMMON_H -#define BACKENDS_PLATFORM_IPHONE_IPHONE_COMMON_H +#ifndef BACKENDS_PLATFORM_IOS7_IOS7_COMMON_H +#define BACKENDS_PLATFORM_IOS7_IOS7_COMMON_H #include "graphics/surface.h" diff --git a/backends/platform/ios7/ios7_keyboard.h b/backends/platform/ios7/ios7_keyboard.h index ddd8f436e5..1f917cc8c5 100644 --- a/backends/platform/ios7/ios7_keyboard.h +++ b/backends/platform/ios7/ios7_keyboard.h @@ -20,8 +20,8 @@ * */ -#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_KEYBOARD_H -#define BACKENDS_PLATFORM_IPHONE_IPHONE_KEYBOARD_H +#ifndef BACKENDS_PLATFORM_IOS7_IOS7_KEYBOARD_H +#define BACKENDS_PLATFORM_IOS7_IOS7_KEYBOARD_H #include <UIKit/UIKit.h> #include <UIKit/UITextView.h> diff --git a/backends/platform/ios7/ios7_keyboard.mm b/backends/platform/ios7/ios7_keyboard.mm index 7923a1cda9..9476b96ad4 100644 --- a/backends/platform/ios7/ios7_keyboard.mm +++ b/backends/platform/ios7/ios7_keyboard.mm @@ -20,7 +20,7 @@ * */ -#include "ios7_keyboard.h" +#include "backends/platform/ios7/ios7_keyboard.h" @interface UITextInputTraits - (void)setAutocorrectionType:(int)type; diff --git a/backends/platform/ios7/ios7_main.mm b/backends/platform/ios7/ios7_main.mm index 96f41f4c02..c36cc08aaa 100644 --- a/backends/platform/ios7/ios7_main.mm +++ b/backends/platform/ios7/ios7_main.mm @@ -26,7 +26,7 @@ #include <UIKit/UIKit.h> #include <Foundation/NSThread.h> -#include "ios7_video.h" +#include "backends/platform/ios7/ios7_video.h" int iOS7_argc; diff --git a/backends/platform/ios7/ios7_osys_events.cpp b/backends/platform/ios7/ios7_osys_events.cpp index 7e805f34b7..3621c084db 100644 --- a/backends/platform/ios7/ios7_osys_events.cpp +++ b/backends/platform/ios7/ios7_osys_events.cpp @@ -26,7 +26,7 @@ #include "gui/message.h" #include "common/translation.h" -#include "ios7_osys_main.h" +#include "backends/platform/ios7/ios7_osys_main.h" static const int kQueuedInputEventDelay = 50; diff --git a/backends/platform/ios7/ios7_osys_main.cpp b/backends/platform/ios7/ios7_osys_main.cpp index f169dbb1b2..c1280a2969 100644 --- a/backends/platform/ios7/ios7_osys_main.cpp +++ b/backends/platform/ios7/ios7_osys_main.cpp @@ -48,7 +48,7 @@ #include "graphics/scaler.h" #include "graphics/scaler/aspect.h" -#include "ios7_osys_main.h" +#include "backends/platform/ios7/ios7_osys_main.h" const OSystem::GraphicsMode OSystem_iOS7::s_supportedGraphicsModes[] = { diff --git a/backends/platform/ios7/ios7_osys_main.h b/backends/platform/ios7/ios7_osys_main.h index eadb49e5ac..cc2f1ccc06 100644 --- a/backends/platform/ios7/ios7_osys_main.h +++ b/backends/platform/ios7/ios7_osys_main.h @@ -20,11 +20,11 @@ * */ -#ifndef BACKENDS_PLATFORM_IPHONE_OSYS_MAIN_H -#define BACKENDS_PLATFORM_IPHONE_OSYS_MAIN_H +#ifndef BACKENDS_PLATFORM_IOS7_IOS7_OSYS_MAIN_H +#define BACKENDS_PLATFORM_IOS7_IOS7_OSYS_MAIN_H #include "graphics/surface.h" -#include "ios7_common.h" +#include "backends/platform/ios7/ios7_common.h" #include "backends/base-backend.h" #include "common/events.h" #include "audio/mixer_intern.h" diff --git a/backends/platform/ios7/ios7_osys_sound.cpp b/backends/platform/ios7/ios7_osys_sound.cpp index 0dc81a9385..07e9458711 100644 --- a/backends/platform/ios7/ios7_osys_sound.cpp +++ b/backends/platform/ios7/ios7_osys_sound.cpp @@ -23,7 +23,7 @@ // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL -#include "ios7_osys_main.h" +#include "backends/platform/ios7/ios7_osys_main.h" void OSystem_iOS7::AQBufferCallback(void *in, AudioQueueRef inQ, AudioQueueBufferRef outQB) { //printf("AQBufferCallback()\n"); diff --git a/backends/platform/ios7/ios7_osys_video.mm b/backends/platform/ios7/ios7_osys_video.mm index 0d183ce834..6784cf46f5 100644 --- a/backends/platform/ios7/ios7_osys_video.mm +++ b/backends/platform/ios7/ios7_osys_video.mm @@ -23,11 +23,11 @@ // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL -#include "ios7_osys_main.h" -#include "ios7_video.h" +#include "backends/platform/ios7/ios7_osys_main.h" +#include "backends/platform/ios7/ios7_video.h" #include "graphics/conversion.h" -#import "iOS7AppDelegate.h" +#include "backends/platform/ios7/ios7_app_delegate.h" @interface iOS7AlertHandler : NSObject<UIAlertViewDelegate> @end diff --git a/backends/platform/ios7/iOS7ScummVMViewController.h b/backends/platform/ios7/ios7_scummvm_view_controller.h index 0322bc6f7f..39168aaee7 100644 --- a/backends/platform/ios7/iOS7ScummVMViewController.h +++ b/backends/platform/ios7/ios7_scummvm_view_controller.h @@ -20,9 +20,14 @@ * */ -#import <UIKit/UIKit.h> +#ifndef BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H +#define BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H + +#include <UIKit/UIKit.h> @interface iOS7ScummVMViewController : UIViewController @end + +#endif diff --git a/backends/platform/ios7/iOS7ScummVMViewController.mm b/backends/platform/ios7/ios7_scummvm_view_controller.mm index f92fd0115c..e78fc91f93 100644 --- a/backends/platform/ios7/iOS7ScummVMViewController.mm +++ b/backends/platform/ios7/ios7_scummvm_view_controller.mm @@ -20,7 +20,7 @@ * */ -#import "iOS7ScummVMViewController.h" +#include "backends/platform/ios7/ios7_scummvm_view_controller.h" @implementation iOS7ScummVMViewController diff --git a/backends/platform/ios7/ios7_video.h b/backends/platform/ios7/ios7_video.h index ab261a977b..9c5d92a970 100644 --- a/backends/platform/ios7/ios7_video.h +++ b/backends/platform/ios7/ios7_video.h @@ -20,8 +20,8 @@ * */ -#ifndef BACKENDS_PLATFORM_IPHONE_IPHONE_VIDEO_H -#define BACKENDS_PLATFORM_IPHONE_IPHONE_VIDEO_H +#ifndef BACKENDS_PLATFORM_IOS7_IOS7_VIDEO_H +#define BACKENDS_PLATFORM_IOS7_IOS7_VIDEO_H #include <UIKit/UIKit.h> #include <Foundation/Foundation.h> @@ -31,11 +31,11 @@ #include <OpenGLES/ES2/gl.h> #include <OpenGLES/ES2/glext.h> -#include "ios7_keyboard.h" -#include "ios7_common.h" +#include "backends/platform/ios7/ios7_keyboard.h" +#include "backends/platform/ios7/ios7_common.h" #include "common/list.h" -#import "graphics/scaler.h" +#include "graphics/scaler.h" typedef struct { GLfloat x, y; diff --git a/backends/platform/ios7/ios7_video.mm b/backends/platform/ios7/ios7_video.mm index 2cfc3e05f7..5c0434d43e 100644 --- a/backends/platform/ios7/ios7_video.mm +++ b/backends/platform/ios7/ios7_video.mm @@ -23,11 +23,11 @@ // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL -#include "ios7_video.h" +#include "backends/platform/ios7/ios7_video.h" #include "graphics/colormasks.h" #include "common/system.h" -#import "iOS7AppDelegate.h" +#include "backends/platform/ios7/ios7_app_delegate.h" static int g_needsScreenUpdate = 0; diff --git a/backends/platform/ios7/module.mk b/backends/platform/ios7/module.mk index 5ee4c7a601..ad4f7fda5b 100644 --- a/backends/platform/ios7/module.mk +++ b/backends/platform/ios7/module.mk @@ -8,8 +8,8 @@ MODULE_OBJS := \ ios7_main.o \ ios7_video.o \ ios7_keyboard.o \ - iOS7ScummVMViewController.o \ - iOS7AppDelegate.o + ios7_scummvm_view_controller.o \ + ios7_app_delegate.o # We don't use rules.mk but rather manually update OBJS and MODULE_DIRS. MODULE_OBJS := $(addprefix $(MODULE)/, $(MODULE_OBJS)) |