diff options
author | Oystein Eftevaag | 2009-02-15 13:58:15 +0000 |
---|---|---|
committer | Oystein Eftevaag | 2009-02-15 13:58:15 +0000 |
commit | 5b86801553966b0fc71ae9b357506fac4e37a944 (patch) | |
tree | 3070ebb2f1572433e5d64fee16e551c4cb5101db /gui | |
parent | 01625a01abc71fff54501d929bee5a6079bd3ee8 (diff) | |
download | scummvm-rg350-5b86801553966b0fc71ae9b357506fac4e37a944.tar.gz scummvm-rg350-5b86801553966b0fc71ae9b357506fac4e37a944.tar.bz2 scummvm-rg350-5b86801553966b0fc71ae9b357506fac4e37a944.zip |
Merged revisions 36329, 38212, 38226and 38234 from branch-0-13-0 to trunk: iPhone backend updates
svn-id: r38240
Diffstat (limited to 'gui')
-rw-r--r-- | gui/ThemeEngine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp index f5d6fc6d29..d895910988 100644 --- a/gui/ThemeEngine.cpp +++ b/gui/ThemeEngine.cpp @@ -42,7 +42,7 @@ #include "gui/ThemeEval.h" #include "gui/ThemeParser.h" -#ifdef MACOSX +#if defined(MACOSX) || defined(IPHONE) #include <CoreFoundation/CoreFoundation.h> #endif @@ -1385,7 +1385,7 @@ void ThemeEngine::listUsableThemes(Common::List<ThemeDescriptor> &list) { listUsableThemes(Common::FSNode(DATA_PATH), list); #endif -#ifdef MACOSX +#if defined(MACOSX) || defined(IPHONE) CFURLRef resourceUrl = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle()); if (resourceUrl) { char buf[256]; |