Merge pull request #994 from unknownbrackets/ios

Improve iOS packaging
This commit is contained in:
Henrik Rydgård 2013-03-15 03:13:15 -07:00
commit 4a5aff8c0f
2 changed files with 11 additions and 1 deletions

View File

@ -998,13 +998,21 @@ file(INSTALL ${NativeAssets} DESTINATION assets)
# packaging and code signing
if (IOS)
file(GLOB IOSAssets ios/assets/*.png)
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})
add_custom_command(TARGET PPSSPP POST_BUILD
COMMAND tar -c -C . --exclude .DS_Store --exclude .git -H `find assets` | tar -x -C '${APP_DIR_NAME}'
)
set_target_properties(${TargetBin} PROPERTIES MACOSX_BUNDLE_INFO_PLIST "../ios/PPSSPP-Info.plist")
set_target_properties(${TargetBin} PROPERTIES
MACOSX_BUNDLE_INFO_PLIST "../ios/PPSSPP-Info.plist"
XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "iPhone/iPad"
)
endif()
#include(CPack)

View File

@ -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