diff --git a/External/build.sh b/External/build.sh index 8b8f8c8..0e41c51 100755 --- a/External/build.sh +++ b/External/build.sh @@ -84,7 +84,7 @@ if [[ $BUILD_PLATFORM != 'Android' ]]; then libdecor-0-dev$TARGET_APT_ARCH fi else - if [[ -z $ANDROID_HOME || -z $NDK_VER || -z $PLATFORM_VER || -z $ANDROID_ABI ]]; then + if [[ -z $ANDROID_HOME || -z $NDK_VER || -z $ANDROID_ABI ]]; then echo "One or more required environment variables are not defined." exit 1 fi @@ -94,7 +94,7 @@ else export ANDROID_NDK_HOME="$ANDROID_HOME/ndk/$NDK_VER" export FLAGS="$FLAGS -DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake \ -DANDROID_HOME=$ANDROID_HOME \ - -DANDROID_PLATFORM=$PLATFORM_VER \ + -DANDROID_PLATFORM=21 \ -DANDROID_ABI=$ANDROID_ABI \ -DCMAKE_POSITION_INDEPENDENT_CODE=ON \ -DCMAKE_FIND_ROOT_PATH_MODE_PACKAGE=BOTH \ @@ -154,6 +154,11 @@ run_cmake() { sed -i 's/#include /#_include /g' CMakeLists.txt fi + # Change the minumum Android API level for SDL_mixer to API 24 as opusfile and libflac fail to build on lower versions. + if [[ $BUILD_PLATFORM == 'Android' && $LIB_NAME == 'SDL_mixer' ]]; then + export FLAGS="${FLAGS/-DANDROID_PLATFORM=21/-DANDROID_PLATFORM=24}" + fi + rm -rf build cmake -B build $FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSDL_SHARED=ON -DSDL_STATIC=OFF "${@:3}" cmake --build build/ --config $BUILD_TYPE --verbose diff --git a/README.md b/README.md index 4854048..5379181 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ Contributions to keep the bindings up-to-date with upstream changes are welcome. | `SDL3-CS` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `SDL3_image-CS` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `SDL3_ttf-CS` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | -| `SDL3_mixer-CS` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | +| `SDL3_mixer-CS` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | API 24+ | ## Generating bindings diff --git a/README_nuget.md b/README_nuget.md index 2453519..4bca6c0 100644 --- a/README_nuget.md +++ b/README_nuget.md @@ -16,4 +16,4 @@ Contributions to keep the bindings up-to-date with upstream changes are welcome. | `SDL3-CS` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `SDL3_image-CS` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | `SDL3_ttf-CS` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | -| `SDL3_mixer-CS` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | \ No newline at end of file +| `SDL3_mixer-CS` | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | API 24+ | \ No newline at end of file