libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2025-01-23 09:34:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Travis: Fix android script.

Browse Source
This commit is contained in:
Sacha 2013-12-06 00:35:45 +10:00
parent 8eacddf549
commit 502621bb08
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -39,9 +39,9 @@ install:
- elif [ "$PPSSPP_BUILD_TYPE" == "Android" ]; then
NDK_VER=android-ndk-r9b &&
sudo apt-get install ant -qq &&
download_extract http://dl.google.com/android/ndk/${NDK_VER}-linux-x86_64.tar.bz2 ${NDK_VER}-linux-x86_64.tar.bz2
export ANDROID_HOME=$(pwd)/${NDK_VER} NDK=$(pwd)/${NDK_VER};
if [[ "$CXX" == *clang* ]]; then export NDK_TOOLCHAIN_VERSION=clang; fi
download_extract http://dl.google.com/android/ndk/${NDK_VER}-linux-x86_64.tar.bz2 ${NDK_VER}-linux-x86_64.tar.bz2 &&
export ANDROID_HOME=$(pwd)/${NDK_VER} NDK=$(pwd)/${NDK_VER} &&
if [[ "$CXX" == *clang* ]]; then export NDK_TOOLCHAIN_VERSION=clang; fi;
# Blackberry NDK: 10.2.0.1155
- elif [ "$PPSSPP_BUILD_TYPE" == "Blackberry" ]; then
download_extract https://googledrive.com/host/0B5UBD4wjtpZ-QVdzSElobzNTOU0 libs.tar.gz &&

3
Core/Util/GameManager.cpp
View File

@ -130,7 +130,8 @@ bool GameManager::InstallGame(std::string zipfile) {
#ifdef _WIN32
struct zip *z = zip_open(ConvertUTF8ToWString(zipfile).c_str(), 0, &error);
#elif defined(__SYMBIAN32__)
struct zip *z = zip_open(std::wstring(zipfile).c_str(), 0, &error);
// If zipfile is non-ascii, this may not function correctly. Other options?
struct zip *z = zip_open(std::wstring(zipfile.begin(), zipfile.end()).c_str(), 0, &error);
#else
struct zip *z = zip_open(zipfile.c_str(), 0, &error);
#endif