From e6b52c502589627181de0bb40ed35cdc44bcdd6e Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Fri, 15 Mar 2013 01:59:56 -0700 Subject: [PATCH] iOS: Embed fonts into the app bundle. --- CMakeLists.txt | 1 + android/jni/NativeApp.cpp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 94f334a4dd..dbd41ed9c2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1002,6 +1002,7 @@ if (IOS) file(INSTALL ${IOSAssets} DESTINATION assets) + file(INSTALL flash0 DESTINATION assets) set(RSRC_XIB_FILES assets/Icon@2x.png) SET_SOURCE_FILES_PROPERTIES(${RSRC_XIB_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources) set(APP_DIR_NAME \${TARGET_BUILD_DIR}/\${FULL_PRODUCT_NAME}) diff --git a/android/jni/NativeApp.cpp b/android/jni/NativeApp.cpp index 073102fc7b..69234a7e17 100644 --- a/android/jni/NativeApp.cpp +++ b/android/jni/NativeApp.cpp @@ -255,6 +255,8 @@ void NativeInit(int argc, const char *argv[], const char *savegame_directory, co g_Config.memCardDirectory = user_data_path; #ifdef BLACKBERRY g_Config.flashDirectory = "app/native/assets/flash/"; +#elif IOS + g_Config.flashDirectory = std::string(external_directory) + "flash0/"; #else g_Config.flashDirectory = user_data_path+"/flash/"; #endif