diff options
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/platform/ios7/iOS7AppDelegate.mm | 2 | ||||
| -rw-r--r-- | backends/platform/ios7/ios7_osys_main.cpp | 15 | ||||
| -rw-r--r-- | backends/platform/iphone/osys_main.cpp | 6 |
3 files changed, 11 insertions, 12 deletions
diff --git a/backends/platform/ios7/iOS7AppDelegate.mm b/backends/platform/ios7/iOS7AppDelegate.mm index d664f91ccc..e9908ec146 100644 --- a/backends/platform/ios7/iOS7AppDelegate.mm +++ b/backends/platform/ios7/iOS7AppDelegate.mm @@ -32,8 +32,8 @@ - (void)applicationDidFinishLaunching:(UIApplication *)application { CGRect rect = [[UIScreen mainScreen] bounds]; +#ifdef IPHONE_SANDBOXED // Create the directory for savegames -#ifdef IPHONE_OFFICIAL NSFileManager *fm = [NSFileManager defaultManager]; NSString *documentPath = [NSString stringWithUTF8String:iOS7_getDocumentsDir()]; NSString *savePath = [documentPath stringByAppendingPathComponent:@"Savegames"]; diff --git a/backends/platform/ios7/ios7_osys_main.cpp b/backends/platform/ios7/ios7_osys_main.cpp index d6b9ce3741..37fa34ce33 100644 --- a/backends/platform/ios7/ios7_osys_main.cpp +++ b/backends/platform/ios7/ios7_osys_main.cpp @@ -88,7 +88,7 @@ OSystem_iOS7::OSystem_iOS7() : _lastErrorMessage(NULL), _mouseCursorPaletteEnabled(false), _gfxTransactionError(kTransactionSuccess) { _queuedInputEvent.type = Common::EVENT_INVALID; _touchpadModeEnabled = !iOS7_isBigDevice(); -#ifdef IPHONE_OFFICIAL +#ifdef IPHONE_SANDBOXED _fsFactory = new ChRootFilesystemFactory(iOS7_getDocumentsDir()); #else _fsFactory = new POSIXFilesystemFactory(); @@ -123,7 +123,7 @@ int OSystem_iOS7::timerHandler(int t) { } void OSystem_iOS7::initBackend() { -#ifdef IPHONE_OFFICIAL +#ifdef IPHONE_SANDBOXED _savefileManager = new DefaultSaveFileManager("/Savegames"); #else _savefileManager = new DefaultSaveFileManager(SCUMMVM_SAVE_PATH); @@ -282,7 +282,7 @@ OSystem_iOS7 *OSystem_iOS7::sharedInstance() { } Common::String OSystem_iOS7::getDefaultConfigFileName() { -#ifdef IPHONE_OFFICIAL +#ifdef IPHONE_SANDBOXED Common::String path = "/Preferences"; return path; #else @@ -299,13 +299,12 @@ void OSystem_iOS7::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) if (CFURLGetFileSystemRepresentation(fileUrl, true, buf, sizeof(buf))) { // Success: Add it to the search path Common::String bundlePath((const char *)buf); -#ifdef IPHONE_OFFICIAL +#ifdef IPHONE_SANDBOXED POSIXFilesystemNode *posixNode = new POSIXFilesystemNode(bundlePath); Common::FSNode *node = new Common::FSNode(posixNode); - s.add("__OSX_BUNDLE__", new Common::FSDirectory(*node), priority); + s.add("__IOS_BUNDLE__", new Common::FSDirectory(*node), priority); #else - // OS X - s.add("__OSX_BUNDLE__", new Common::FSDirectory(bundlePath), priority); + s.add("__IOS_BUNDLE__", new Common::FSDirectory(bundlePath), priority); #endif } CFRelease(fileUrl); @@ -351,7 +350,7 @@ void iOS7_main(int argc, char **argv) { //gDebugLevel = 10; } -#ifdef IPHONE_OFFICIAL +#ifdef IPHONE_SANDBOXED chdir(iOS7_getDocumentsDir()); #else system("mkdir " SCUMMVM_ROOT_PATH); diff --git a/backends/platform/iphone/osys_main.cpp b/backends/platform/iphone/osys_main.cpp index 0ce21b44c1..3f5e7692c7 100644 --- a/backends/platform/iphone/osys_main.cpp +++ b/backends/platform/iphone/osys_main.cpp @@ -90,7 +90,7 @@ int OSystem_IPHONE::timerHandler(int t) { } void OSystem_IPHONE::initBackend() { -#ifdef IPHONE_OFFICIAL +#ifdef IPHONE_SANDBOXED _savefileManager = new DefaultSaveFileManager(iPhone_getDocumentsDir()); #else _savefileManager = new DefaultSaveFileManager(SCUMMVM_SAVE_PATH); @@ -252,7 +252,7 @@ OSystem *OSystem_IPHONE_create() { } Common::String OSystem_IPHONE::getDefaultConfigFileName() { -#ifdef IPHONE_OFFICIAL +#ifdef IPHONE_SANDBOXED Common::String path = iPhone_getDocumentsDir(); path += "/Preferences"; return path; @@ -305,7 +305,7 @@ void iphone_main(int argc, char *argv[]) { //gDebugLevel = 10; } -#ifdef IPHONE_OFFICIAL +#ifdef IPHONE_SANDBOXED chdir(iPhone_getDocumentsDir()); #else system("mkdir " SCUMMVM_ROOT_PATH); |