thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IOS: Renames a macro

Browse source
This commit is contained in:
Vincent Bénony 2016-01-07 09:51:13 +01:00
parent a4f9b9e2ae
commit b5ef98637c
5 changed files with 19 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
audio/softsynth/fluidsynth.cpp
View file

@ -31,7 +31,7 @@
#include "audio/musicplugin.h" #include "audio/musicplugin.h"
#include "audio/mpu401.h" #include "audio/mpu401.h"
#include "audio/softsynth/emumidi.h" #include "audio/softsynth/emumidi.h"
#ifdef IPHONE_OFFICIAL_IOS7 #if defined(IPHONE_IOS7) && defined(IPHONE_SANDBOXED)
#include <string.h> #include <string.h>
#include <sys/syslimits.h> #include <sys/syslimits.h>
#include "backends/platform/ios7/ios7_common.h" #include "backends/platform/ios7/ios7_common.h"
@ -184,7 +184,7 @@ int MidiDriver_FluidSynth::open() {
const char *soundfont = ConfMan.get("soundfont").c_str(); const char *soundfont = ConfMan.get("soundfont").c_str();
#ifdef IPHONE_OFFICIAL_IOS7 #if defined(IPHONE_IOS7) && defined(IPHONE_SANDBOXED)
// HACK: Due to the sandbox on non-jailbroken iOS devices, we need to deal with the chroot filesystem. // HACK: Due to the sandbox on non-jailbroken iOS devices, we need to deal with the chroot filesystem.
// All the path selected by the user are relative to the Document directory. So, we need to adjust // All the path selected by the user are relative to the Document directory. So, we need to adjust
// the path to reflect that. // the path to reflect that.

2
backends/platform/ios7/iOS7AppDelegate.mm
View file

@ -32,8 +32,8 @@
- (void)applicationDidFinishLaunching:(UIApplication *)application { - (void)applicationDidFinishLaunching:(UIApplication *)application {
CGRect rect = [[UIScreen mainScreen] bounds]; CGRect rect = [[UIScreen mainScreen] bounds];
#ifdef IPHONE_SANDBOXED
// Create the directory for savegames // Create the directory for savegames
#ifdef IPHONE_OFFICIAL
NSFileManager *fm = [NSFileManager defaultManager]; NSFileManager *fm = [NSFileManager defaultManager];
NSString *documentPath = [NSString stringWithUTF8String:iOS7_getDocumentsDir()]; NSString *documentPath = [NSString stringWithUTF8String:iOS7_getDocumentsDir()];
NSString *savePath = [documentPath stringByAppendingPathComponent:@"Savegames"]; NSString *savePath = [documentPath stringByAppendingPathComponent:@"Savegames"];

15
backends/platform/ios7/ios7_osys_main.cpp
View file

@ -88,7 +88,7 @@ OSystem_iOS7::OSystem_iOS7() :
_lastErrorMessage(NULL), _mouseCursorPaletteEnabled(false), _gfxTransactionError(kTransactionSuccess) { _lastErrorMessage(NULL), _mouseCursorPaletteEnabled(false), _gfxTransactionError(kTransactionSuccess) {
_queuedInputEvent.type = Common::EVENT_INVALID; _queuedInputEvent.type = Common::EVENT_INVALID;
_touchpadModeEnabled = !iOS7_isBigDevice(); _touchpadModeEnabled = !iOS7_isBigDevice();
#ifdef IPHONE_OFFICIAL #ifdef IPHONE_SANDBOXED
_fsFactory = new ChRootFilesystemFactory(iOS7_getDocumentsDir()); _fsFactory = new ChRootFilesystemFactory(iOS7_getDocumentsDir());
#else #else
_fsFactory = new POSIXFilesystemFactory(); _fsFactory = new POSIXFilesystemFactory();
@ -123,7 +123,7 @@ int OSystem_iOS7::timerHandler(int t) {
} }
void OSystem_iOS7::initBackend() { void OSystem_iOS7::initBackend() {
#ifdef IPHONE_OFFICIAL #ifdef IPHONE_SANDBOXED
_savefileManager = new DefaultSaveFileManager("/Savegames"); _savefileManager = new DefaultSaveFileManager("/Savegames");
#else #else
_savefileManager = new DefaultSaveFileManager(SCUMMVM_SAVE_PATH); _savefileManager = new DefaultSaveFileManager(SCUMMVM_SAVE_PATH);
@ -282,7 +282,7 @@ OSystem_iOS7 *OSystem_iOS7::sharedInstance() {
} }
Common::String OSystem_iOS7::getDefaultConfigFileName() { Common::String OSystem_iOS7::getDefaultConfigFileName() {
#ifdef IPHONE_OFFICIAL #ifdef IPHONE_SANDBOXED
Common::String path = "/Preferences"; Common::String path = "/Preferences";
return path; return path;
#else #else
@ -299,13 +299,12 @@ void OSystem_iOS7::addSysArchivesToSearchSet(Common::SearchSet &s, int priority)
if (CFURLGetFileSystemRepresentation(fileUrl, true, buf, sizeof(buf))) { if (CFURLGetFileSystemRepresentation(fileUrl, true, buf, sizeof(buf))) {
// Success: Add it to the search path // Success: Add it to the search path
Common::String bundlePath((const char *)buf); Common::String bundlePath((const char *)buf);
#ifdef IPHONE_OFFICIAL #ifdef IPHONE_SANDBOXED
POSIXFilesystemNode *posixNode = new POSIXFilesystemNode(bundlePath); POSIXFilesystemNode *posixNode = new POSIXFilesystemNode(bundlePath);
Common::FSNode *node = new Common::FSNode(posixNode); 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 #else
// OS X s.add("__IOS_BUNDLE__", new Common::FSDirectory(bundlePath), priority);
s.add("__OSX_BUNDLE__", new Common::FSDirectory(bundlePath), priority);
#endif #endif
} }
CFRelease(fileUrl); CFRelease(fileUrl);
@ -351,7 +350,7 @@ void iOS7_main(int argc, char **argv) {
//gDebugLevel = 10; //gDebugLevel = 10;
} }
#ifdef IPHONE_OFFICIAL #ifdef IPHONE_SANDBOXED
chdir(iOS7_getDocumentsDir()); chdir(iOS7_getDocumentsDir());
#else #else
system("mkdir " SCUMMVM_ROOT_PATH); system("mkdir " SCUMMVM_ROOT_PATH);

6
backends/platform/iphone/osys_main.cpp
View file

@ -90,7 +90,7 @@ int OSystem_IPHONE::timerHandler(int t) {
} }
void OSystem_IPHONE::initBackend() { void OSystem_IPHONE::initBackend() {
#ifdef IPHONE_OFFICIAL #ifdef IPHONE_SANDBOXED
_savefileManager = new DefaultSaveFileManager(iPhone_getDocumentsDir()); _savefileManager = new DefaultSaveFileManager(iPhone_getDocumentsDir());
#else #else
_savefileManager = new DefaultSaveFileManager(SCUMMVM_SAVE_PATH); _savefileManager = new DefaultSaveFileManager(SCUMMVM_SAVE_PATH);
@ -252,7 +252,7 @@ OSystem *OSystem_IPHONE_create() {
} }
Common::String OSystem_IPHONE::getDefaultConfigFileName() { Common::String OSystem_IPHONE::getDefaultConfigFileName() {
#ifdef IPHONE_OFFICIAL #ifdef IPHONE_SANDBOXED
Common::String path = iPhone_getDocumentsDir(); Common::String path = iPhone_getDocumentsDir();
path += "/Preferences"; path += "/Preferences";
return path; return path;
@ -305,7 +305,7 @@ void iphone_main(int argc, char *argv[]) {
//gDebugLevel = 10; //gDebugLevel = 10;
} }
#ifdef IPHONE_OFFICIAL #ifdef IPHONE_SANDBOXED
chdir(iPhone_getDocumentsDir()); chdir(iPhone_getDocumentsDir());
#else #else
system("mkdir " SCUMMVM_ROOT_PATH); system("mkdir " SCUMMVM_ROOT_PATH);

12
devtools/create_project/xcode.cpp
View file

@ -790,8 +790,8 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ValueList scummvm_defines(_defines); ValueList scummvm_defines(_defines);
REMOVE_DEFINE(scummvm_defines, "MACOSX"); REMOVE_DEFINE(scummvm_defines, "MACOSX");
REMOVE_DEFINE(scummvm_defines, "IPHONE"); REMOVE_DEFINE(scummvm_defines, "IPHONE");
REMOVE_DEFINE(scummvm_defines, "IPHONE_OFFICIAL"); REMOVE_DEFINE(scummvm_defines, "IPHONE_IOS7");
REMOVE_DEFINE(scummvm_defines, "IPHONE_OFFICIAL_IOS7"); REMOVE_DEFINE(scummvm_defines, "IPHONE_SANDBOXED");
REMOVE_DEFINE(scummvm_defines, "SDL_BACKEND"); REMOVE_DEFINE(scummvm_defines, "SDL_BACKEND");
ADD_SETTING_LIST(scummvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, kSettingsNoQuote | kSettingsAsList, 5); ADD_SETTING_LIST(scummvm_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvm_defines, kSettingsNoQuote | kSettingsAsList, 5);
ADD_SETTING(scummvm_Debug, "GCC_THUMB_SUPPORT", "NO"); ADD_SETTING(scummvm_Debug, "GCC_THUMB_SUPPORT", "NO");
@ -877,8 +877,8 @@ void XcodeProvider::setupBuildConfiguration(const BuildSetup &setup) {
ValueList scummvmIOS_defines; ValueList scummvmIOS_defines;
ADD_DEFINE(scummvmIOS_defines, "\"$(inherited)\""); ADD_DEFINE(scummvmIOS_defines, "\"$(inherited)\"");
ADD_DEFINE(scummvmIOS_defines, "IPHONE"); ADD_DEFINE(scummvmIOS_defines, "IPHONE");
ADD_DEFINE(scummvmIOS_defines, "IPHONE_OFFICIAL"); ADD_DEFINE(scummvmIOS_defines, "IPHONE_IOS7");
ADD_DEFINE(scummvmIOS_defines, "IPHONE_OFFICIAL_IOS7"); ADD_DEFINE(scummvmIOS_defines, "IPHONE_SANDBOXED");
ADD_SETTING_LIST(iPhone_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmIOS_defines, kSettingsNoQuote | kSettingsAsList, 5); ADD_SETTING_LIST(iPhone_Debug, "GCC_PREPROCESSOR_DEFINITIONS", scummvmIOS_defines, kSettingsNoQuote | kSettingsAsList, 5);
ADD_SETTING(iPhone_Debug, "ASSETCATALOG_COMPILER_APPICON_NAME", "AppIcon"); ADD_SETTING(iPhone_Debug, "ASSETCATALOG_COMPILER_APPICON_NAME", "AppIcon");
ADD_SETTING(iPhone_Debug, "ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME", "LaunchImage"); ADD_SETTING(iPhone_Debug, "ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME", "LaunchImage");
@ -1033,8 +1033,8 @@ void XcodeProvider::setupDefines(const BuildSetup &setup) {
// Add special defines for Mac support // Add special defines for Mac support
REMOVE_DEFINE(_defines, "MACOSX"); REMOVE_DEFINE(_defines, "MACOSX");
REMOVE_DEFINE(_defines, "IPHONE"); REMOVE_DEFINE(_defines, "IPHONE");
REMOVE_DEFINE(_defines, "IPHONE_OFFICIAL"); REMOVE_DEFINE(_defines, "IPHONE_IOS7");
REMOVE_DEFINE(_defines, "IPHONE_OFFICIAL_IOS7"); REMOVE_DEFINE(_defines, "IPHONE_SANDBOXED");
REMOVE_DEFINE(_defines, "SDL_BACKEND"); REMOVE_DEFINE(_defines, "SDL_BACKEND");
ADD_DEFINE(_defines, "CONFIG_H"); ADD_DEFINE(_defines, "CONFIG_H");
ADD_DEFINE(_defines, "UNIX"); ADD_DEFINE(_defines, "UNIX");