preserve-emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-07-11 01:25:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

travis: Enable iOS armv7 builds

Browse Source
This commit is contained in:
Florent Castelli
2016-10-14 23:15:16 +02:00
parent 492bda6d04
commit 49d7cddb35
3 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.sh
+7 -10
View File
@@ -58,10 +58,10 @@ travis_install() {
if [ "$QT" = "TRUE" ]; then
sudo apt-get install -qq qt5-qmake qtmultimedia5-dev qtsystems5-dev qtbase5-dev qtdeclarative5-dev qttools5-dev-tools libqt5webkit5-dev libsqlite3-dev qt5-default
fi
fi
if [ "$CMAKE" = "TRUE" ]; then
download_extract "https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" cmake-3.6.2-Linux-x86_64.tar.gz
if [ "$CMAKE" = "TRUE" ]; then
download_extract "https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" cmake-3.6.2-Linux-x86_64.tar.gz
fi
fi
# Android NDK + GCC 4.8
@@ -88,12 +88,12 @@ travis_install() {
}
travis_script() {
if [ -d cmake-3.6.2-Linux-x86_64 ]; then
export PATH=$(pwd)/cmake-3.6.2-Linux-x86_64/bin:$PATH
fi
# Compile PPSSPP
if [ "$PPSSPP_BUILD_TYPE" = "Linux" ]; then
if [ -d cmake-3.6.2-Linux-x86_64 ]; then
export PATH=$(pwd)/cmake-3.6.2-Linux-x86_64/bin:$PATH
fi
if [ "$QT" = "TRUE" ]; then
./b.sh --qt
else
@@ -112,9 +112,6 @@ travis_script() {
fi
if [ "$PPSSPP_BUILD_TYPE" = "iOS" ]; then
./b.sh --ios
pushd build
xcodebuild -configuration Release
popd build
fi
}
.travis.yml
+5 -5
View File
@@ -66,11 +66,11 @@ matrix:
compiler: "gcc qt"
env: PPSSPP_BUILD_TYPE=Linux
QT=TRUE
# Can't get iOS to work.
# - os: osx
# compiler: "clang ios"
# env: PPSSPP_BUILD_TYPE=iOS
# CMAKE=TRUE
- os: osx
osx_image: xcode8
compiler: "clang ios"
env: PPSSPP_BUILD_TYPE=iOS
CMAKE=TRUE
before_install:
- bash .travis.sh travis_before_install
b.sh
+1 -9
View File
@@ -8,10 +8,8 @@ do
--qt) echo "Qt enabled"
CMAKE=0
;;
--ios) CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=ios/ios.toolchain.cmake -GXcode ${CMAKE_ARGS}"
--ios) CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=cmake/Toolchains/ios.cmake ${CMAKE_ARGS}"
TARGET_OS=iOS
PACKAGE=1
echo !!!!!!!!!!!!!!! The error below is expected. Go into build-ios and open the XCodeProj.
;;
--android) CMAKE_ARGS="-DCMAKE_TOOLCHAIN_FILE=android/android.toolchain.cmake ${CMAKE_ARGS}"
TARGET_OS=Android
@@ -74,10 +72,4 @@ else
fi
make -j4 $MAKE_OPT
if [ "$PACKAGE" == "1" ]; then
if [ "$TARGET_OS" == "iOS" ]; then
xcodebuild -configuration Release
fi
fi
popd