From 9e6952ed8c1444dcd7f325d24a172844e9896a62 Mon Sep 17 00:00:00 2001 From: Anonymous Maarten Date: Wed, 21 Dec 2022 10:21:33 +0100 Subject: [PATCH] android: fix android-prefab.sh for SDL3 --- build-scripts/android-prefab.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build-scripts/android-prefab.sh b/build-scripts/android-prefab.sh index a08249dd5..6d5344fc8 100755 --- a/build-scripts/android-prefab.sh +++ b/build-scripts/android-prefab.sh @@ -40,9 +40,9 @@ android_api=19 android_ndk=21 android_stl="c++_shared" -sdl_major=$(sed -ne 's/^#define SDL_MAJOR_VERSION *//p' "${sdl_root}/include/SDL_version.h") -sdl_minor=$(sed -ne 's/^#define SDL_MINOR_VERSION *//p' "${sdl_root}/include/SDL_version.h") -sdl_patch=$(sed -ne 's/^#define SDL_PATCHLEVEL *//p' "${sdl_root}/include/SDL_version.h") +sdl_major=$(sed -ne 's/^#define SDL_MAJOR_VERSION *//p' "${sdl_root}/include/SDL3/SDL_version.h") +sdl_minor=$(sed -ne 's/^#define SDL_MINOR_VERSION *//p' "${sdl_root}/include/SDL3/SDL_version.h") +sdl_patch=$(sed -ne 's/^#define SDL_PATCHLEVEL *//p' "${sdl_root}/include/SDL3/SDL_version.h") sdl_version="${sdl_major}.${sdl_minor}.${sdl_patch}" echo "Building Android prefab package for SDL version $sdl_version" @@ -201,8 +201,8 @@ create_shared_sdl_module() { "library_name": "libSDL${sdl_major}" } EOF - mkdir -p "${sdl_moduleworkdir}/include" - cp -r "${abi_build_prefix}/include/SDL${sdl_major}/"* "${sdl_moduleworkdir}/include/" + mkdir -p "${sdl_moduleworkdir}/include/SDL${sdl_major}" + cp -r "${abi_build_prefix}/include/SDL${sdl_major}/"* "${sdl_moduleworkdir}/include/SDL${sdl_major}" abi_sdllibdir="${sdl_moduleworkdir}/libs/android.${android_abi}" mkdir -p "${abi_sdllibdir}" @@ -233,8 +233,8 @@ create_static_sdl_module() { "library_name": "libSDL${sdl_major}" } EOF - mkdir -p "${sdl_moduleworkdir}/include" - cp -r "${abi_build_prefix}/include/SDL${sdl_major}/"* "${sdl_moduleworkdir}/include" + mkdir -p "${sdl_moduleworkdir}/include/SDL${sdl_major}" + cp -r "${abi_build_prefix}/include/SDL${sdl_major}/"* "${sdl_moduleworkdir}/include/SDL${sdl_major}" abi_sdllibdir="${sdl_moduleworkdir}/libs/android.${android_abi}" mkdir -p "${abi_sdllibdir}"