[Scummvm-cvs-logs] scummvm master -> afd4b82a8ad760abee3224e618e951da72268d51

lordhoto lordhoto at gmail.com
Thu Jan 7 12:46:38 CET 2016


This automated email contains information about 6 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
bcaa725184 IOS7: Use our standard GPL headers.
17a57443ae IOS7: Use standard include guard names.
8fc03872c4 IOS7: Use #include instead of #import.
3130b22fcb IOS7: Make filename style consistent in itself.
f8ef5e2476 IOS7: Make includes match our style.
afd4b82a8a IPHONE: Make includes match our style.


Commit: bcaa725184e8d7df22f6dc0c4bfff953fb0504ef
    https://github.com/scummvm/scummvm/commit/bcaa725184e8d7df22f6dc0c4bfff953fb0504ef
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-07T12:44:48+01:00

Commit Message:
IOS7: Use our standard GPL headers.

Changed paths:
    backends/platform/ios7/iOS7AppDelegate.h
    backends/platform/ios7/iOS7AppDelegate.mm



diff --git a/backends/platform/ios7/iOS7AppDelegate.h b/backends/platform/ios7/iOS7AppDelegate.h
index 7f903a6..a34ad9b 100644
--- a/backends/platform/ios7/iOS7AppDelegate.h
+++ b/backends/platform/ios7/iOS7AppDelegate.h
@@ -1,6 +1,24 @@
-//
-// 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.
+ *
+ */
 
 #import <UIKit/UIKit.h>
 
diff --git a/backends/platform/ios7/iOS7AppDelegate.mm b/backends/platform/ios7/iOS7AppDelegate.mm
index e9908ec..9d1cb9e 100644
--- a/backends/platform/ios7/iOS7AppDelegate.mm
+++ b/backends/platform/ios7/iOS7AppDelegate.mm
@@ -1,6 +1,24 @@
-//
-// 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"


Commit: 17a57443aea26bf51cc7992049f2503e6cecb672
    https://github.com/scummvm/scummvm/commit/17a57443aea26bf51cc7992049f2503e6cecb672
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-07T12:44:48+01:00

Commit Message:
IOS7: Use standard include guard names.

Changed paths:
    backends/platform/ios7/iOS7AppDelegate.h
    backends/platform/ios7/iOS7ScummVMViewController.h
    backends/platform/ios7/ios7_common.h
    backends/platform/ios7/ios7_keyboard.h
    backends/platform/ios7/ios7_osys_main.h
    backends/platform/ios7/ios7_video.h



diff --git a/backends/platform/ios7/iOS7AppDelegate.h b/backends/platform/ios7/iOS7AppDelegate.h
index a34ad9b..2249898 100644
--- a/backends/platform/ios7/iOS7AppDelegate.h
+++ b/backends/platform/ios7/iOS7AppDelegate.h
@@ -20,6 +20,9 @@
  *
  */
 
+#ifndef BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H
+#define BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H
+
 #import <UIKit/UIKit.h>
 
 @class iPhoneView;
@@ -31,3 +34,5 @@
 + (iPhoneView *)iPhoneView;
 
 @end
+
+#endif
diff --git a/backends/platform/ios7/iOS7ScummVMViewController.h b/backends/platform/ios7/iOS7ScummVMViewController.h
index 0322bc6..54eac14 100644
--- a/backends/platform/ios7/iOS7ScummVMViewController.h
+++ b/backends/platform/ios7/iOS7ScummVMViewController.h
@@ -20,9 +20,14 @@
  *
  */
 
+#ifndef BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H
+#define BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H
+
 #import <UIKit/UIKit.h>
 
 
 @interface iOS7ScummVMViewController : UIViewController
 
 @end
+
+#endif
diff --git a/backends/platform/ios7/ios7_common.h b/backends/platform/ios7/ios7_common.h
index a32a59a..12740d4 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 ddd8f43..1f917cc 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_osys_main.h b/backends/platform/ios7/ios7_osys_main.h
index eadb49e..4ad6528 100644
--- a/backends/platform/ios7/ios7_osys_main.h
+++ b/backends/platform/ios7/ios7_osys_main.h
@@ -20,8 +20,8 @@
  *
  */
 
-#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"
diff --git a/backends/platform/ios7/ios7_video.h b/backends/platform/ios7/ios7_video.h
index ab261a9..b530bad 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>


Commit: 8fc03872c4a7d79f984a08163515f206f61ce4d4
    https://github.com/scummvm/scummvm/commit/8fc03872c4a7d79f984a08163515f206f61ce4d4
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-07T12:44:48+01:00

Commit Message:
IOS7: Use #include instead of #import.

We always use #include. #import is a nice ObjC feature (in theory), but can
lead to odd results in corner cases.

Changed paths:
    backends/platform/ios7/iOS7AppDelegate.h
    backends/platform/ios7/iOS7AppDelegate.mm
    backends/platform/ios7/iOS7ScummVMViewController.h
    backends/platform/ios7/iOS7ScummVMViewController.mm
    backends/platform/ios7/ios7_osys_video.mm
    backends/platform/ios7/ios7_video.h
    backends/platform/ios7/ios7_video.mm



diff --git a/backends/platform/ios7/iOS7AppDelegate.h b/backends/platform/ios7/iOS7AppDelegate.h
index 2249898..08696c7 100644
--- a/backends/platform/ios7/iOS7AppDelegate.h
+++ b/backends/platform/ios7/iOS7AppDelegate.h
@@ -23,7 +23,7 @@
 #ifndef BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H
 #define BACKENDS_PLATFORM_IOS7_IOS7_APP_DELEGATE_H
 
-#import <UIKit/UIKit.h>
+#include <UIKit/UIKit.h>
 
 @class iPhoneView;
 
diff --git a/backends/platform/ios7/iOS7AppDelegate.mm b/backends/platform/ios7/iOS7AppDelegate.mm
index 9d1cb9e..dbc8172 100644
--- a/backends/platform/ios7/iOS7AppDelegate.mm
+++ b/backends/platform/ios7/iOS7AppDelegate.mm
@@ -21,9 +21,9 @@
  */
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
-#import "iOS7AppDelegate.h"
-#import "iOS7ScummVMViewController.h"
-#import "ios7_video.h"
+#include "iOS7AppDelegate.h"
+#include "iOS7ScummVMViewController.h"
+#include "ios7_video.h"
 
 @implementation iOS7AppDelegate {
 	UIWindow *_window;
diff --git a/backends/platform/ios7/iOS7ScummVMViewController.h b/backends/platform/ios7/iOS7ScummVMViewController.h
index 54eac14..39168aa 100644
--- a/backends/platform/ios7/iOS7ScummVMViewController.h
+++ b/backends/platform/ios7/iOS7ScummVMViewController.h
@@ -23,7 +23,7 @@
 #ifndef BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H
 #define BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H
 
-#import <UIKit/UIKit.h>
+#include <UIKit/UIKit.h>
 
 
 @interface iOS7ScummVMViewController : UIViewController
diff --git a/backends/platform/ios7/iOS7ScummVMViewController.mm b/backends/platform/ios7/iOS7ScummVMViewController.mm
index f92fd01..8dfa012 100644
--- a/backends/platform/ios7/iOS7ScummVMViewController.mm
+++ b/backends/platform/ios7/iOS7ScummVMViewController.mm
@@ -20,7 +20,7 @@
  *
  */
 
-#import "iOS7ScummVMViewController.h"
+#include "iOS7ScummVMViewController.h"
 
 
 @implementation iOS7ScummVMViewController
diff --git a/backends/platform/ios7/ios7_osys_video.mm b/backends/platform/ios7/ios7_osys_video.mm
index 0d183ce..908d0bf 100644
--- a/backends/platform/ios7/ios7_osys_video.mm
+++ b/backends/platform/ios7/ios7_osys_video.mm
@@ -27,7 +27,7 @@
 #include "ios7_video.h"
 
 #include "graphics/conversion.h"
-#import "iOS7AppDelegate.h"
+#include "iOS7AppDelegate.h"
 
 @interface iOS7AlertHandler : NSObject<UIAlertViewDelegate>
 @end
diff --git a/backends/platform/ios7/ios7_video.h b/backends/platform/ios7/ios7_video.h
index b530bad..d2161d6 100644
--- a/backends/platform/ios7/ios7_video.h
+++ b/backends/platform/ios7/ios7_video.h
@@ -35,7 +35,7 @@
 #include "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 2cfc3e0..337d460 100644
--- a/backends/platform/ios7/ios7_video.mm
+++ b/backends/platform/ios7/ios7_video.mm
@@ -27,7 +27,7 @@
 
 #include "graphics/colormasks.h"
 #include "common/system.h"
-#import "iOS7AppDelegate.h"
+#include "iOS7AppDelegate.h"
 
 static int g_needsScreenUpdate = 0;
 


Commit: 3130b22fcbdfa4cf284e3612a2d7f5f80a4b7c81
    https://github.com/scummvm/scummvm/commit/3130b22fcbdfa4cf284e3612a2d7f5f80a4b7c81
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-07T12:44:48+01:00

Commit Message:
IOS7: Make filename style consistent in itself.

Changed paths:
  A backends/platform/ios7/ios7_app_delegate.h
  A backends/platform/ios7/ios7_app_delegate.mm
  A backends/platform/ios7/ios7_scummvm_view_controller.h
  A backends/platform/ios7/ios7_scummvm_view_controller.mm
  R backends/platform/ios7/iOS7AppDelegate.h
  R backends/platform/ios7/iOS7AppDelegate.mm
  R backends/platform/ios7/iOS7ScummVMViewController.h
  R backends/platform/ios7/iOS7ScummVMViewController.mm
    backends/platform/ios7/ios7_osys_video.mm
    backends/platform/ios7/ios7_video.mm
    backends/platform/ios7/module.mk



diff --git a/backends/platform/ios7/iOS7AppDelegate.h b/backends/platform/ios7/iOS7AppDelegate.h
deleted file mode 100644
index 08696c7..0000000
--- a/backends/platform/ios7/iOS7AppDelegate.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* 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>
-
- at class iPhoneView;
-
-
- at interface iOS7AppDelegate : NSObject<UIApplicationDelegate>
-
-+ (iOS7AppDelegate *)iOS7AppDelegate;
-+ (iPhoneView *)iPhoneView;
-
- at end
-
-#endif
diff --git a/backends/platform/ios7/iOS7AppDelegate.mm b/backends/platform/ios7/iOS7AppDelegate.mm
deleted file mode 100644
index dbc8172..0000000
--- a/backends/platform/ios7/iOS7AppDelegate.mm
+++ /dev/null
@@ -1,113 +0,0 @@
-/* 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
-#include "iOS7AppDelegate.h"
-#include "iOS7ScummVMViewController.h"
-#include "ios7_video.h"
-
- at implementation iOS7AppDelegate {
-	UIWindow *_window;
-	iOS7ScummVMViewController *_controller;
-	iPhoneView *_view;
-}
-
-- (id)init {
-	if (self = [super init]) {
-		_window = nil;
-		_view = nil;
-	}
-	return self;
-}
-
-- (void)mainLoop:(id)param {
-	@autoreleasepool {
-		iOS7_main(iOS7_argc, iOS7_argv);
-	}
-
-	exit(0);
-}
-
-- (void)applicationDidFinishLaunching:(UIApplication *)application {
-	CGRect rect = [[UIScreen mainScreen] bounds];
-
-#ifdef IPHONE_SANDBOXED
-	// Create the directory for savegames
-	NSFileManager *fm = [NSFileManager defaultManager];
-	NSString *documentPath = [NSString stringWithUTF8String:iOS7_getDocumentsDir()];
-	NSString *savePath = [documentPath stringByAppendingPathComponent:@"Savegames"];
-	if (![fm fileExistsAtPath:savePath]) {
-		[fm createDirectoryAtPath:savePath withIntermediateDirectories:YES attributes:nil error:nil];
-	}
-#endif
-
-	_window = [[UIWindow alloc] initWithFrame:rect];
-	[_window retain];
-
-	_controller = [[iOS7ScummVMViewController alloc] init];
-
-	_view = [[iPhoneView alloc] initWithFrame:rect];
-	_view.multipleTouchEnabled = YES;
-	_controller.view = _view;
-
-	[_window setRootViewController:_controller];
-	[_window makeKeyAndVisible];
-
-	[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
-	[[NSNotificationCenter defaultCenter] addObserver:self
-	                                         selector:@selector(didRotate:)
-	                                             name:@"UIDeviceOrientationDidChangeNotification"
-	                                           object:nil];
-
-	[NSThread detachNewThreadSelector:@selector(mainLoop:) toTarget:self withObject:nil];
-}
-
-- (void)applicationWillResignActive:(UIApplication *)application {
-	[_view applicationSuspend];
-}
-
-- (void)applicationDidBecomeActive:(UIApplication *)application {
-	[_view applicationResume];
-}
-
-- (void)didRotate:(NSNotification *)notification {
-	UIDeviceOrientation screenOrientation = [[UIDevice currentDevice] orientation];
-	[_view deviceOrientationChanged:screenOrientation];
-}
-
-+ (iOS7AppDelegate *)iOS7AppDelegate {
-	UIApplication *app = [UIApplication sharedApplication];
-	return (iOS7AppDelegate *) app.delegate;
-}
-
-+ (iPhoneView *)iPhoneView {
-	iOS7AppDelegate *appDelegate = [self iOS7AppDelegate];
-	return appDelegate->_view;
-}
-
- at end
-
-const char *iOS7_getDocumentsDir() {
-	NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-	NSString *documentsDirectory = [paths objectAtIndex:0];
-	return [documentsDirectory UTF8String];
-}
diff --git a/backends/platform/ios7/iOS7ScummVMViewController.h b/backends/platform/ios7/iOS7ScummVMViewController.h
deleted file mode 100644
index 39168aa..0000000
--- a/backends/platform/ios7/iOS7ScummVMViewController.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/* 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_SCUMMVM_VIEW_CONTROLLER_H
-#define BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H
-
-#include <UIKit/UIKit.h>
-
-
- at interface iOS7ScummVMViewController : UIViewController
-
- at end
-
-#endif
diff --git a/backends/platform/ios7/iOS7ScummVMViewController.mm b/backends/platform/ios7/iOS7ScummVMViewController.mm
deleted file mode 100644
index 8dfa012..0000000
--- a/backends/platform/ios7/iOS7ScummVMViewController.mm
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 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.
- *
- */
-
-#include "iOS7ScummVMViewController.h"
-
-
- at implementation iOS7ScummVMViewController
-
-- (BOOL)prefersStatusBarHidden {
-    return YES;
-}
-
- at end
diff --git a/backends/platform/ios7/ios7_app_delegate.h b/backends/platform/ios7/ios7_app_delegate.h
new file mode 100644
index 0000000..08696c7
--- /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>
+
+ at class iPhoneView;
+
+
+ at interface iOS7AppDelegate : NSObject<UIApplicationDelegate>
+
++ (iOS7AppDelegate *)iOS7AppDelegate;
++ (iPhoneView *)iPhoneView;
+
+ at end
+
+#endif
diff --git a/backends/platform/ios7/ios7_app_delegate.mm b/backends/platform/ios7/ios7_app_delegate.mm
new file mode 100644
index 0000000..8c1ef90
--- /dev/null
+++ b/backends/platform/ios7/ios7_app_delegate.mm
@@ -0,0 +1,113 @@
+/* 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
+#include "ios7_app_delegate.h"
+#include "ios7_scummvm_view_controller.h"
+#include "ios7_video.h"
+
+ at implementation iOS7AppDelegate {
+	UIWindow *_window;
+	iOS7ScummVMViewController *_controller;
+	iPhoneView *_view;
+}
+
+- (id)init {
+	if (self = [super init]) {
+		_window = nil;
+		_view = nil;
+	}
+	return self;
+}
+
+- (void)mainLoop:(id)param {
+	@autoreleasepool {
+		iOS7_main(iOS7_argc, iOS7_argv);
+	}
+
+	exit(0);
+}
+
+- (void)applicationDidFinishLaunching:(UIApplication *)application {
+	CGRect rect = [[UIScreen mainScreen] bounds];
+
+#ifdef IPHONE_SANDBOXED
+	// Create the directory for savegames
+	NSFileManager *fm = [NSFileManager defaultManager];
+	NSString *documentPath = [NSString stringWithUTF8String:iOS7_getDocumentsDir()];
+	NSString *savePath = [documentPath stringByAppendingPathComponent:@"Savegames"];
+	if (![fm fileExistsAtPath:savePath]) {
+		[fm createDirectoryAtPath:savePath withIntermediateDirectories:YES attributes:nil error:nil];
+	}
+#endif
+
+	_window = [[UIWindow alloc] initWithFrame:rect];
+	[_window retain];
+
+	_controller = [[iOS7ScummVMViewController alloc] init];
+
+	_view = [[iPhoneView alloc] initWithFrame:rect];
+	_view.multipleTouchEnabled = YES;
+	_controller.view = _view;
+
+	[_window setRootViewController:_controller];
+	[_window makeKeyAndVisible];
+
+	[[UIDevice currentDevice] beginGeneratingDeviceOrientationNotifications];
+	[[NSNotificationCenter defaultCenter] addObserver:self
+	                                         selector:@selector(didRotate:)
+	                                             name:@"UIDeviceOrientationDidChangeNotification"
+	                                           object:nil];
+
+	[NSThread detachNewThreadSelector:@selector(mainLoop:) toTarget:self withObject:nil];
+}
+
+- (void)applicationWillResignActive:(UIApplication *)application {
+	[_view applicationSuspend];
+}
+
+- (void)applicationDidBecomeActive:(UIApplication *)application {
+	[_view applicationResume];
+}
+
+- (void)didRotate:(NSNotification *)notification {
+	UIDeviceOrientation screenOrientation = [[UIDevice currentDevice] orientation];
+	[_view deviceOrientationChanged:screenOrientation];
+}
+
++ (iOS7AppDelegate *)iOS7AppDelegate {
+	UIApplication *app = [UIApplication sharedApplication];
+	return (iOS7AppDelegate *) app.delegate;
+}
+
++ (iPhoneView *)iPhoneView {
+	iOS7AppDelegate *appDelegate = [self iOS7AppDelegate];
+	return appDelegate->_view;
+}
+
+ at end
+
+const char *iOS7_getDocumentsDir() {
+	NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+	NSString *documentsDirectory = [paths objectAtIndex:0];
+	return [documentsDirectory UTF8String];
+}
diff --git a/backends/platform/ios7/ios7_osys_video.mm b/backends/platform/ios7/ios7_osys_video.mm
index 908d0bf..2a198e1 100644
--- a/backends/platform/ios7/ios7_osys_video.mm
+++ b/backends/platform/ios7/ios7_osys_video.mm
@@ -27,7 +27,7 @@
 #include "ios7_video.h"
 
 #include "graphics/conversion.h"
-#include "iOS7AppDelegate.h"
+#include "ios7_app_delegate.h"
 
 @interface iOS7AlertHandler : NSObject<UIAlertViewDelegate>
 @end
diff --git a/backends/platform/ios7/ios7_scummvm_view_controller.h b/backends/platform/ios7/ios7_scummvm_view_controller.h
new file mode 100644
index 0000000..39168aa
--- /dev/null
+++ b/backends/platform/ios7/ios7_scummvm_view_controller.h
@@ -0,0 +1,33 @@
+/* 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_SCUMMVM_VIEW_CONTROLLER_H
+#define BACKENDS_PLATFORM_IOS7_IOS7_SCUMMVM_VIEW_CONTROLLER_H
+
+#include <UIKit/UIKit.h>
+
+
+ at interface iOS7ScummVMViewController : UIViewController
+
+ at end
+
+#endif
diff --git a/backends/platform/ios7/ios7_scummvm_view_controller.mm b/backends/platform/ios7/ios7_scummvm_view_controller.mm
new file mode 100644
index 0000000..18d6770
--- /dev/null
+++ b/backends/platform/ios7/ios7_scummvm_view_controller.mm
@@ -0,0 +1,32 @@
+/* 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.
+ *
+ */
+
+#include "ios7_scummvm_view_controller.h"
+
+
+ at implementation iOS7ScummVMViewController
+
+- (BOOL)prefersStatusBarHidden {
+    return YES;
+}
+
+ at end
diff --git a/backends/platform/ios7/ios7_video.mm b/backends/platform/ios7/ios7_video.mm
index 337d460..4f027cd 100644
--- a/backends/platform/ios7/ios7_video.mm
+++ b/backends/platform/ios7/ios7_video.mm
@@ -27,7 +27,7 @@
 
 #include "graphics/colormasks.h"
 #include "common/system.h"
-#include "iOS7AppDelegate.h"
+#include "ios7_app_delegate.h"
 
 static int g_needsScreenUpdate = 0;
 
diff --git a/backends/platform/ios7/module.mk b/backends/platform/ios7/module.mk
index 5ee4c7a..ad4f7fd 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))


Commit: f8ef5e247624a00fabb1f17f3987d010623a7067
    https://github.com/scummvm/scummvm/commit/f8ef5e247624a00fabb1f17f3987d010623a7067
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-07T12:44:48+01:00

Commit Message:
IOS7: Make includes match our style.

Changed paths:
    backends/platform/ios7/ios7_app_delegate.mm
    backends/platform/ios7/ios7_keyboard.mm
    backends/platform/ios7/ios7_main.mm
    backends/platform/ios7/ios7_osys_events.cpp
    backends/platform/ios7/ios7_osys_main.cpp
    backends/platform/ios7/ios7_osys_main.h
    backends/platform/ios7/ios7_osys_sound.cpp
    backends/platform/ios7/ios7_osys_video.mm
    backends/platform/ios7/ios7_scummvm_view_controller.mm
    backends/platform/ios7/ios7_video.h
    backends/platform/ios7/ios7_video.mm



diff --git a/backends/platform/ios7/ios7_app_delegate.mm b/backends/platform/ios7/ios7_app_delegate.mm
index 8c1ef90..88d0a89 100644
--- a/backends/platform/ios7/ios7_app_delegate.mm
+++ b/backends/platform/ios7/ios7_app_delegate.mm
@@ -21,9 +21,9 @@
  */
 
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
-#include "ios7_app_delegate.h"
-#include "ios7_scummvm_view_controller.h"
-#include "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_keyboard.mm b/backends/platform/ios7/ios7_keyboard.mm
index 7923a1c..9476b96 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 96f41f4..c36cc08 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 7e805f3..3621c08 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 f169dbb..c1280a2 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 4ad6528..cc2f1cc 100644
--- a/backends/platform/ios7/ios7_osys_main.h
+++ b/backends/platform/ios7/ios7_osys_main.h
@@ -24,7 +24,7 @@
 #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 0dc81a9..07e9458 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 2a198e1..6784cf4 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"
-#include "ios7_app_delegate.h"
+#include "backends/platform/ios7/ios7_app_delegate.h"
 
 @interface iOS7AlertHandler : NSObject<UIAlertViewDelegate>
 @end
diff --git a/backends/platform/ios7/ios7_scummvm_view_controller.mm b/backends/platform/ios7/ios7_scummvm_view_controller.mm
index 18d6770..e78fc91 100644
--- a/backends/platform/ios7/ios7_scummvm_view_controller.mm
+++ b/backends/platform/ios7/ios7_scummvm_view_controller.mm
@@ -20,7 +20,7 @@
  *
  */
 
-#include "ios7_scummvm_view_controller.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 d2161d6..9c5d92a 100644
--- a/backends/platform/ios7/ios7_video.h
+++ b/backends/platform/ios7/ios7_video.h
@@ -31,8 +31,8 @@
 #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"
 #include "graphics/scaler.h"
diff --git a/backends/platform/ios7/ios7_video.mm b/backends/platform/ios7/ios7_video.mm
index 4f027cd..5c0434d 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"
-#include "ios7_app_delegate.h"
+#include "backends/platform/ios7/ios7_app_delegate.h"
 
 static int g_needsScreenUpdate = 0;
 


Commit: afd4b82a8ad760abee3224e618e951da72268d51
    https://github.com/scummvm/scummvm/commit/afd4b82a8ad760abee3224e618e951da72268d51
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2016-01-07T12:44:48+01:00

Commit Message:
IPHONE: Make includes match our style.

Changed paths:
    backends/platform/iphone/iphone_keyboard.mm
    backends/platform/iphone/iphone_main.mm
    backends/platform/iphone/iphone_video.h
    backends/platform/iphone/iphone_video.mm
    backends/platform/iphone/osys_events.cpp
    backends/platform/iphone/osys_main.cpp
    backends/platform/iphone/osys_main.h
    backends/platform/iphone/osys_sound.cpp
    backends/platform/iphone/osys_video.mm



diff --git a/backends/platform/iphone/iphone_keyboard.mm b/backends/platform/iphone/iphone_keyboard.mm
index 39d68af..85ba352 100644
--- a/backends/platform/iphone/iphone_keyboard.mm
+++ b/backends/platform/iphone/iphone_keyboard.mm
@@ -20,7 +20,7 @@
  *
  */
 
-#include "iphone_keyboard.h"
+#include "backends/platform/iphone/iphone_keyboard.h"
 
 @interface UITextInputTraits
 - (void)setAutocorrectionType:(int)type;
diff --git a/backends/platform/iphone/iphone_main.mm b/backends/platform/iphone/iphone_main.mm
index 3707f10..fc29615 100644
--- a/backends/platform/iphone/iphone_main.mm
+++ b/backends/platform/iphone/iphone_main.mm
@@ -26,7 +26,7 @@
 #include <UIKit/UIKit.h>
 #include <Foundation/NSThread.h>
 
-#include "iphone_video.h"
+#include "backends/platform/iphone/iphone_video.h"
 
 void iphone_main(int argc, char *argv[]);
 
diff --git a/backends/platform/iphone/iphone_video.h b/backends/platform/iphone/iphone_video.h
index 7dbf3c5..26c3218 100644
--- a/backends/platform/iphone/iphone_video.h
+++ b/backends/platform/iphone/iphone_video.h
@@ -31,8 +31,8 @@
 #include <OpenGLES/ES1/gl.h>
 #include <OpenGLES/ES1/glext.h>
 
-#include "iphone_keyboard.h"
-#include "iphone_common.h"
+#include "backends/platform/iphone/iphone_keyboard.h"
+#include "backends/platform/iphone/iphone_common.h"
 
 #include "common/list.h"
 
diff --git a/backends/platform/iphone/iphone_video.mm b/backends/platform/iphone/iphone_video.mm
index 5048b57..9e521de 100644
--- a/backends/platform/iphone/iphone_video.mm
+++ b/backends/platform/iphone/iphone_video.mm
@@ -23,7 +23,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
-#include "iphone_video.h"
+#include "backends/platform/iphone/iphone_video.h"
 
 #include "graphics/colormasks.h"
 
diff --git a/backends/platform/iphone/osys_events.cpp b/backends/platform/iphone/osys_events.cpp
index 95ca25a..617f6b8 100644
--- a/backends/platform/iphone/osys_events.cpp
+++ b/backends/platform/iphone/osys_events.cpp
@@ -26,7 +26,7 @@
 #include "gui/message.h"
 #include "common/translation.h"
 
-#include "osys_main.h"
+#include "backends/platform/iphone/osys_main.h"
 
 static const int kQueuedInputEventDelay = 50;
 
diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp
index 3f5e769..36b3482 100644
--- a/backends/platform/iphone/osys_main.cpp
+++ b/backends/platform/iphone/osys_main.cpp
@@ -41,7 +41,7 @@
 #include "audio/mixer.h"
 #include "audio/mixer_intern.h"
 
-#include "osys_main.h"
+#include "backends/platform/iphone/osys_main.h"
 
 
 const OSystem::GraphicsMode OSystem_IPHONE::s_supportedGraphicsModes[] = {
diff --git a/backends/platform/iphone/osys_main.h b/backends/platform/iphone/osys_main.h
index 0159eee..3905663 100644
--- a/backends/platform/iphone/osys_main.h
+++ b/backends/platform/iphone/osys_main.h
@@ -24,7 +24,7 @@
 #define BACKENDS_PLATFORM_IPHONE_OSYS_MAIN_H
 
 #include "graphics/surface.h"
-#include "iphone_common.h"
+#include "backends/platform/iphone/iphone_common.h"
 #include "backends/base-backend.h"
 #include "common/events.h"
 #include "audio/mixer_intern.h"
diff --git a/backends/platform/iphone/osys_sound.cpp b/backends/platform/iphone/osys_sound.cpp
index bfee06c..34c1cbf 100644
--- a/backends/platform/iphone/osys_sound.cpp
+++ b/backends/platform/iphone/osys_sound.cpp
@@ -23,7 +23,7 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
-#include "osys_main.h"
+#include "backends/platform/iphone/osys_main.h"
 
 void OSystem_IPHONE::AQBufferCallback(void *in, AudioQueueRef inQ, AudioQueueBufferRef outQB) {
 	//printf("AQBufferCallback()\n");
diff --git a/backends/platform/iphone/osys_video.mm b/backends/platform/iphone/osys_video.mm
index c76f432..fa5c729 100644
--- a/backends/platform/iphone/osys_video.mm
+++ b/backends/platform/iphone/osys_video.mm
@@ -23,8 +23,8 @@
 // Disable symbol overrides so that we can use system headers.
 #define FORBIDDEN_SYMBOL_ALLOW_ALL
 
-#include "osys_main.h"
-#include "iphone_video.h"
+#include "backends/platform/iphone/osys_main.h"
+#include "backends/platform/iphone/iphone_video.h"
 
 #include "graphics/conversion.h"
 






More information about the Scummvm-git-logs mailing list