ShuriZma
/
libretro-super
mirror of https://github.com/libretro/libretro-super.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #768 from webgeek1234/master 

Fix and simplify android cmake path
This commit is contained in:
Andrés 2018-03-28 23:02:02 -05:00 committed by GitHub
parent b9cc766240 61b11b9431
commit 0d9e12105f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libretro-buildbot-recipe.sh
View File

@ -363,10 +363,9 @@ build_libretro_generic_makefile() {
echo -------------------------------------------------- | tee -a "$LOGFILE" echo -------------------------------------------------- | tee -a "$LOGFILE"
if [ "${COMMAND}" = "CMAKE" ]; then if [ "${COMMAND}" = "CMAKE" ]; then
if [ "${PLATFORM}" = "android" ]; then if [ "${PLATFORM}" = "android" ]; then
EXTRAARGS="-DCMAKE_SYSTEM_NAME=Android \ EXTRAARGS="-DANDROID_PLATFORM=android-${API_LEVEL} \
-DCMAKE_SYSTEM_VERSION=${API_LEVEL} \ -DANDROID_ABI=${ABI_OVERRIDE} \
-DCMAKE_ANDROID_ARCH_ABI=${ABI_OVERRIDE} \ -DCMAKE_TOOLCHAIN_FILE=${NDK_ROOT}/build/cmake/android.toolchain.cmake"
-DCMAKE_ANDROID_NDK=${NDK_ROOT}"
fi fi
eval "set -- ${EXTRAARGS} \${CORE_ARGS}" eval "set -- ${EXTRAARGS} \${CORE_ARGS}"
@ -397,6 +396,8 @@ build_libretro_generic_makefile() {
if [ "${PLATFORM}" = "windows" ] || [ "${PLATFORM}" = "unix" ]; then if [ "${PLATFORM}" = "windows" ] || [ "${PLATFORM}" = "unix" ]; then
${STRIP:=strip} -s ${OUT}/${CORENAM} ${STRIP:=strip} -s ${OUT}/${CORENAM}
elif [ "${PLATFORM}" = "android" -a ! -z "${STRIPPATH+x}" ]; then
${NDK_ROOT}/${STRIPPATH} -s ${OUT}/${CORENAM}
fi fi
echo "COPY CMD: cp -v ${OUT}/${ORIGNAM} ${OUTPUT}" 2>&1 | tee -a "$LOGFILE" echo "COPY CMD: cp -v ${OUT}/${ORIGNAM} ${OUTPUT}" 2>&1 | tee -a "$LOGFILE"

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

1
recipes/android/cores-android-cmake-aarch64.conf
View File

@ -14,3 +14,4 @@ CORE_JOB YES
ABI_OVERRIDE arm64-v8a ABI_OVERRIDE arm64-v8a
API_LEVEL 21 API_LEVEL 21
CMAKE cmake CMAKE cmake
STRIPPATH toolchains/aarch64-linux-android-4.9/prebuilt/linux-x86_64/bin/aarch64-linux-android-strip

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

1
recipes/android/cores-android-cmake-armv7.conf
View File

@ -14,3 +14,4 @@ CORE_JOB YES
ABI_OVERRIDE armeabi-v7a ABI_OVERRIDE armeabi-v7a
API_LEVEL 9 API_LEVEL 9
CMAKE cmake CMAKE cmake
STRIPPATH toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip

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

1
recipes/android/cores-android-cmake-x86.conf
View File

@ -14,3 +14,4 @@ CORE_JOB YES
ABI_OVERRIDE x86 ABI_OVERRIDE x86
API_LEVEL 9 API_LEVEL 9
CMAKE cmake CMAKE cmake
STRIPPATH toolchains/x86-4.9/prebuilt/linux-x86_64/bin/i686-linux-android-strip