mirror/libretro-super
1
0
Fork 0
mirror of https://github.com/libretro/libretro-super synced 2025-02-20 18:40:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix and simplify android cmake path

Browse Source
This commit is contained in:
Aaron Kling 2018-03-28 15:32:16 -05:00
parent b9cc766240
commit 2ff2d2dd0a
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libretro-buildbot-recipe.sh
View File

@ -363,10 +363,9 @@ build_libretro_generic_makefile() {
echo -------------------------------------------------- | tee -a "$LOGFILE"
if [ "${COMMAND}" = "CMAKE" ]; then
if [ "${PLATFORM}" = "android" ]; then
EXTRAARGS="-DCMAKE_SYSTEM_NAME=Android \
-DCMAKE_SYSTEM_VERSION=${API_LEVEL} \
-DCMAKE_ANDROID_ARCH_ABI=${ABI_OVERRIDE} \
-DCMAKE_ANDROID_NDK=${NDK_ROOT}"
EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} \
-DANDROID_ABI=${ABI_OVERRIDE} \
-DCMAKE_TOOLCHAIN_FILE=${NDK_ROOT}/build/cmake/android.toolchain.cmake"
fi
eval "set -- ${EXTRAARGS} \${CORE_ARGS}"

2
recipes/android/cores-android-cmake-aarch64
View File

@ -1 +1 @@
ppsspp libretro-ppsspp-aarch64 https://github.com/libretro/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_static -DCMAKE_BUILD_TYPE=Release
ppsspp libretro-ppsspp-aarch64 https://github.com/libretro/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release

2
recipes/android/cores-android-cmake-armv7
View File

@ -1 +1 @@
ppsspp libretro-ppsspp-armv7 https://github.com/libretro/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_static -DCMAKE_BUILD_TYPE=Release
ppsspp libretro-ppsspp-armv7 https://github.com/libretro/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_static -DANDROID_ARM_NEON=ON -DCMAKE_BUILD_TYPE=Release

2
recipes/android/cores-android-cmake-x86
View File

@ -1 +1 @@
ppsspp libretro-ppsspp-x86 https://github.com/libretro/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DCMAKE_ANDROID_NDK_TOOLCHAIN_VERSION=clang -DCMAKE_ANDROID_STL_TYPE=c++_static -DCMAKE_BUILD_TYPE=Release
ppsspp libretro-ppsspp-x86 https://github.com/libretro/ppsspp.git master NO CMAKE Makefile build -DLIBRETRO=ON -DANDROID_TOOLCHAIN=clang -DANDROID_STL=c++_static -DCMAKE_BUILD_TYPE=Release