geemili
/
SDL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

android: fix android-prefab.sh for SDL3

main
Anonymous Maarten 2022-12-21 10:21:33 +01:00 committed by Sam Lantinga
parent 19d4d64cfe
commit 9e6952ed8c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build-scripts/android-prefab.sh
View File

@ -40,9 +40,9 @@ android_api=19
android_ndk=21 android_ndk=21
android_stl="c++_shared" android_stl="c++_shared"
sdl_major=$(sed -ne 's/^#define SDL_MAJOR_VERSION *//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/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/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}" sdl_version="${sdl_major}.${sdl_minor}.${sdl_patch}"
echo "Building Android prefab package for SDL version $sdl_version" echo "Building Android prefab package for SDL version $sdl_version"
@ -201,8 +201,8 @@ create_shared_sdl_module() {
"library_name": "libSDL${sdl_major}" "library_name": "libSDL${sdl_major}"
} }
EOF EOF
mkdir -p "${sdl_moduleworkdir}/include" mkdir -p "${sdl_moduleworkdir}/include/SDL${sdl_major}"
cp -r "${abi_build_prefix}/include/SDL${sdl_major}/"* "${sdl_moduleworkdir}/include/" cp -r "${abi_build_prefix}/include/SDL${sdl_major}/"* "${sdl_moduleworkdir}/include/SDL${sdl_major}"
abi_sdllibdir="${sdl_moduleworkdir}/libs/android.${android_abi}" abi_sdllibdir="${sdl_moduleworkdir}/libs/android.${android_abi}"
mkdir -p "${abi_sdllibdir}" mkdir -p "${abi_sdllibdir}"
@ -233,8 +233,8 @@ create_static_sdl_module() {
"library_name": "libSDL${sdl_major}" "library_name": "libSDL${sdl_major}"
} }
EOF EOF
mkdir -p "${sdl_moduleworkdir}/include" mkdir -p "${sdl_moduleworkdir}/include/SDL${sdl_major}"
cp -r "${abi_build_prefix}/include/SDL${sdl_major}/"* "${sdl_moduleworkdir}/include" cp -r "${abi_build_prefix}/include/SDL${sdl_major}/"* "${sdl_moduleworkdir}/include/SDL${sdl_major}"
abi_sdllibdir="${sdl_moduleworkdir}/libs/android.${android_abi}" abi_sdllibdir="${sdl_moduleworkdir}/libs/android.${android_abi}"
mkdir -p "${abi_sdllibdir}" mkdir -p "${abi_sdllibdir}"