ScummVM/scummvm
1
0
Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

ANDROID: Update to compile with modern NDKs

Browse Source
This commit is contained in:
Cameron Cawley
2019-04-09 23:00:21 +01:00
parent f4d6b736c4
commit f99eaba72e
4 changed files with 5 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backends/platform/android/android.cpp
+1
View File
@@ -343,6 +343,7 @@ void OSystem_Android::initBackend() {
ConfMan.set("fullscreen", "true");
ConfMan.registerDefault("aspect_ratio", true);
ConfMan.registerDefault("vsync", true);
ConfMan.setInt("autosave_period", 0);
ConfMan.setBool("FM_high_quality", false);
backends/platform/android/android.mk
+1 -1
View File
@@ -3,7 +3,7 @@
# These must be incremented for each market upload
ANDROID_VERSIONCODE = 1000
ANDROID_TARGET_VERSION = 15
ANDROID_TARGET_VERSION = 23
NDK_BUILD = $(ANDROID_NDK)/ndk-build APP_ABI=$(ABI)
SDK_ANDROID = $(ANDROID_SDK)/tools/android
backends/platform/android/jni.cpp
+1 -1
View File
@@ -417,7 +417,7 @@ void JNI::setAudioStop() {
void JNI::create(JNIEnv *env, jobject self, jobject asset_manager,
jobject egl, jobject egl_display,
jobject at, jint audio_sample_rate, jint audio_buffer_size) {
LOGI(gScummVMFullVersion);
LOGI("%s", gScummVMFullVersion);
assert(!_system);
configure
Vendored
+2 -33
View File
@@ -2467,7 +2467,8 @@ case $_host_os in
android | android-arm)
append_var CXXFLAGS "-march=armv5te"
append_var CXXFLAGS "-mtune=xscale"
append_var CXXFLAGS "-msoft-float"
append_var CXXFLAGS "-mfloat-abi=softfp"
append_var LDFLAGS "-mthumb"
ABI="armeabi"
# Platform version 9 is used by ResidualVM
ANDROID_PLATFORM=9
@@ -2509,10 +2510,6 @@ case $_host_os in
;;
esac
# Setup platform version and arch
append_var CXXFLAGS "--sysroot=$ANDROID_NDK/platforms/android-$ANDROID_PLATFORM/arch-$ANDROID_PLATFORM_ARCH"
append_var LDFLAGS "--sysroot=$ANDROID_NDK/platforms/android-$ANDROID_PLATFORM/arch-$ANDROID_PLATFORM_ARCH"
append_var CXXFLAGS "-fpic"
append_var CXXFLAGS "-ffunction-sections"
append_var CXXFLAGS "-funwind-tables"
@@ -2523,36 +2520,9 @@ case $_host_os in
append_var CXXFLAGS "-fomit-frame-pointer"
append_var CXXFLAGS "-fstrict-aliasing"
fi
append_var CXXFLAGS "-finline-limit=300"
_optimization_level=-Os
if test "$_host" = android -o "$_host" = android-arm; then
append_var CXXFLAGS "-mthumb-interwork"
# FIXME: Why is the following in CXXFLAGS and not in DEFINES? Change or document this.
append_var CXXFLAGS "-D__ARM_ARCH_5__"
append_var CXXFLAGS "-D__ARM_ARCH_5T__"
append_var CXXFLAGS "-D__ARM_ARCH_5E__"
append_var CXXFLAGS "-D__ARM_ARCH_5TE__"
fi
# surpress 'mangling of 'va_list' has changed in GCC 4.4' warning
append_var CXXFLAGS "-Wno-psabi"
if test "$_host" = android -o "$_host" = android-arm; then
append_var LDFLAGS "-mthumb-interwork"
fi
append_var INCLUDES "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/include/"
append_var INCLUDES "-isystem $ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/libs/$ABI/include/"
append_var LDFLAGS "-L$ANDROID_NDK/sources/cxx-stl/gnu-libstdc++/`$CXX -dumpversion`/libs/$ABI/"
append_var LIBS "-lsupc++"
add_line_to_config_mk "ANDROID_SDK = $ANDROID_SDK"
if test -d "$ANDROID_SDK"/build-tools; then
_build_tools_version=`cd "$ANDROID_SDK"/build-tools && ls -1 | sort -rn | head -1`
add_line_to_config_mk "ANDROID_BTOOLS = build-tools/$_build_tools_version"
else
add_line_to_config_mk "ANDROID_BTOOLS = platform-tools"
fi
_seq_midi=no
;;
beos*)
@@ -2970,7 +2940,6 @@ if test -n "$_host"; then
_port_mk="backends/platform/android/android.mk"
_build_scalers=no
_seq_midi=no
_mt32emu=no
_timidity=no
;;
androidsdl | androidsdl-armeabi | androidsdl-armeabi-v7a | androidsdl-mips | androidsdl-x86 | androidsdl-arm64-v8a | androidsdl-x86_64)