diff options
author | 2023-02-26 19:40:37 +0100 | |
---|---|---|
committer | 2023-02-27 05:40:37 +1100 | |
commit | bd59a0d447b861982429905f186dee8b12f2e777 (patch) | |
tree | dc6341c8fb098818039127f758cf3eb0fade986a /scripts/src/main.lua | |
parent | 28b03e92a84daf79eb3cef75c51c014b2f57807b (diff) |
Removed local copy of SDL source and update Android build support. (#10899)
* Removed SDL2 source.
* Updated gradle.
* Updated SDL2 Java support glue code.
* Increased minimum supported Android API version to 24.
* Updated required asset files for Android app.
* Added proper tag for Android logging.
* Added SDL2 hint to make BGFX work on Android.
Diffstat (limited to 'scripts/src/main.lua')
-rw-r--r-- | scripts/src/main.lua | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/scripts/src/main.lua b/scripts/src/main.lua index cf81aabbd42..53b496cdfad 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -76,26 +76,30 @@ end configuration { } if _OPTIONS["targetos"]=="android" then - includedirs { - MAME_DIR .. "3rdparty/SDL2/include", - } - files { - MAME_DIR .. "3rdparty/SDL2/src/main/android/SDL_android_main.c", + MAME_DIR .. "src/osd/sdl/android_main.cpp", } targetsuffix "" if _OPTIONS["SEPARATE_BIN"]~="1" then if _OPTIONS["PLATFORM"]=="arm" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a") + os.copyfile(_OPTIONS["SDL_INSTALL_ROOT"] .. "/lib/libSDL2.so", MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a/libSDL2.so") + os.copyfile(androidToolchainRoot() .. "/sysroot/usr/lib/arm-linux-androideabi/libc++_shared.so", MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a/libc++_shared.so") end if _OPTIONS["PLATFORM"]=="arm64" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a") + os.copyfile(_OPTIONS["SDL_INSTALL_ROOT"] .. "/lib/libSDL2.so", MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a/libSDL2.so") + os.copyfile(androidToolchainRoot() .. "/sysroot/usr/lib/aarch64-linux-android/libc++_shared.so", MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a/libc++_shared.so") end if _OPTIONS["PLATFORM"]=="x86" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86") + os.copyfile(_OPTIONS["SDL_INSTALL_ROOT"] .. "/lib/libSDL2.so", MAME_DIR .. "android-project/app/src/main/libs/x86/libSDL2.so") + os.copyfile(androidToolchainRoot() .. "/sysroot/usr/lib/i686-linux-android/libc++_shared.so", MAME_DIR .. "android-project/app/src/main/libs/x86/libc++_shared.so") end if _OPTIONS["PLATFORM"]=="x64" then targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86_64") + os.copyfile(_OPTIONS["SDL_INSTALL_ROOT"] .. "/lib/libSDL2.so", MAME_DIR .. "android-project/app/src/main/libs/x86_64/libSDL2.so") + os.copyfile(androidToolchainRoot() .. "/sysroot/usr/lib/x86_64-linux-android/libc++_shared.so", MAME_DIR .. "android-project/app/src/main/libs/x86_64/libc++_shared.so") end end else |