edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-17 21:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add build folder parameter to cmake_android.sh

Browse source 
Add a parameter instead of using the fixed build folder `build_android`.
This commit is contained in:
Robert Müller 2024-05-07 13:13:34 +02:00
parent 9afe7444c1
commit 468cd85839
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/android/cmake_android.sh
View file

@ -11,6 +11,7 @@ ANDROID_NDK="$ANDROID_HOME/ndk/$ANDROID_NDK_VERSION"
_DEFAULT_ANDROID_BUILD=x86 _DEFAULT_ANDROID_BUILD=x86
_DEFAULT_GAME_NAME=DDNet _DEFAULT_GAME_NAME=DDNet
_DEFAULT_BUILD_TYPE=Debug _DEFAULT_BUILD_TYPE=Debug
_DEFAULT_BUILD_FOLDER=build-android
_ANDROID_API_LEVEL=android-24 _ANDROID_API_LEVEL=android-24
_ANDROID_SUB_BUILD_DIR=build_arch _ANDROID_SUB_BUILD_DIR=build_arch
@ -38,6 +39,13 @@ else
_DEFAULT_BUILD_TYPE=$3 _DEFAULT_BUILD_TYPE=$3
fi fi
if [ -z ${4+x} ]; then
printf "\e[31m%s\e[30m\n" "Did not pass build folder, using default: ${_DEFAULT_BUILD_FOLDER}"
_SHOW_USAGE_INFO=1
else
_DEFAULT_BUILD_FOLDER=$4
fi
_ANDROID_JAR_KEY_NAME=~/.android/debug.keystore _ANDROID_JAR_KEY_NAME=~/.android/debug.keystore
_ANDROID_JAR_KEY_PW=android _ANDROID_JAR_KEY_PW=android
_ANDROID_JAR_KEY_ALIAS=androiddebugkey _ANDROID_JAR_KEY_ALIAS=androiddebugkey
@ -99,7 +107,7 @@ function build_for_type() {
-DANDROID_NDK="$ANDROID_NDK" \ -DANDROID_NDK="$ANDROID_NDK" \
-DANDROID_ABI="${2}" \ -DANDROID_ABI="${2}" \
-DANDROID_ARM_NEON=TRUE \ -DANDROID_ARM_NEON=TRUE \
-Bbuild_android/"$_ANDROID_SUB_BUILD_DIR/$1" \ -B${_DEFAULT_BUILD_FOLDER}/"$_ANDROID_SUB_BUILD_DIR/$1" \
-DSERVER=OFF \ -DSERVER=OFF \
-DTOOLS=OFF \ -DTOOLS=OFF \
-DDEV=TRUE \ -DDEV=TRUE \
@ -107,12 +115,12 @@ function build_for_type() {
-DVULKAN=ON \ -DVULKAN=ON \
-DVIDEORECORDER=OFF -DVIDEORECORDER=OFF
( (
cd "build_android/$_ANDROID_SUB_BUILD_DIR/$1" || exit 1 cd "${_DEFAULT_BUILD_FOLDER}/$_ANDROID_SUB_BUILD_DIR/$1" || exit 1
cmake --build . --target DDNet cmake --build . --target DDNet
) )
} }
mkdir build_android mkdir ${_DEFAULT_BUILD_FOLDER}
if [[ "${_DEFAULT_ANDROID_BUILD}" == "arm" || "${_DEFAULT_ANDROID_BUILD}" == "all" ]]; then if [[ "${_DEFAULT_ANDROID_BUILD}" == "arm" || "${_DEFAULT_ANDROID_BUILD}" == "all" ]]; then
build_for_type arm armeabi-v7a arm eabi & build_for_type arm armeabi-v7a arm eabi &
@ -134,7 +142,7 @@ wait
printf "\e[36mPreparing gradle build\n" printf "\e[36mPreparing gradle build\n"
cd build_android || exit 1 cd ${_DEFAULT_BUILD_FOLDER} || exit 1
mkdir -p src/main mkdir -p src/main
mkdir -p src/main/res/mipmap mkdir -p src/main/res/mipmap