ANDROID: Rename Android folder as it's specific for ResidualVM
Pawel Kolodziejski
|
|
@ -56,7 +56,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(__ANDROID__) && !defined(ANDROIDSDL)
|
#if defined(__ANDROID__) && !defined(ANDROIDSDL)
|
||||||
#include "backends/platform/android/jni-android.h"
|
#include "backends/platform/android3d/jni-android.h" // ResidualVM
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
bool POSIXFilesystemNode::exists() const {
|
bool POSIXFilesystemNode::exists() const {
|
||||||
|
|
|
||||||
|
|
@ -65,9 +65,9 @@
|
||||||
#include "backends/keymapper/keymapper-defaults.h"
|
#include "backends/keymapper/keymapper-defaults.h"
|
||||||
#include "backends/keymapper/standard-actions.h"
|
#include "backends/keymapper/standard-actions.h"
|
||||||
|
|
||||||
#include "backends/platform/android/jni-android.h"
|
#include "backends/platform/android3d/jni-android.h"
|
||||||
#include "backends/platform/android/android.h"
|
#include "backends/platform/android3d/android.h"
|
||||||
#include "backends/platform/android/graphics.h"
|
#include "backends/platform/android3d/graphics.h"
|
||||||
|
|
||||||
const char *android_log_tag = "ResidualVM";
|
const char *android_log_tag = "ResidualVM";
|
||||||
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
#if defined(__ANDROID__)
|
#if defined(__ANDROID__)
|
||||||
|
|
||||||
#include "backends/platform/android/portdefs.h"
|
#include "backends/platform/android3d/portdefs.h"
|
||||||
#include "common/fs.h"
|
#include "common/fs.h"
|
||||||
#include "common/archive.h"
|
#include "common/archive.h"
|
||||||
#include "common/mutex.h"
|
#include "common/mutex.h"
|
||||||
|
|
@ -40,10 +40,10 @@
|
||||||
#include "backends/plugins/posix/posix-provider.h"
|
#include "backends/plugins/posix/posix-provider.h"
|
||||||
#include "backends/fs/posix/posix-fs-factory.h"
|
#include "backends/fs/posix/posix-fs-factory.h"
|
||||||
|
|
||||||
#include "backends/platform/android/events.h"
|
#include "backends/platform/android3d/events.h"
|
||||||
#include "backends/platform/android/texture.h"
|
#include "backends/platform/android3d/texture.h"
|
||||||
#include "backends/platform/android/graphics.h"
|
#include "backends/platform/android3d/graphics.h"
|
||||||
#include "backends/platform/android/touchcontrols.h"
|
#include "backends/platform/android3d/touchcontrols.h"
|
||||||
|
|
||||||
#include <pthread.h>
|
#include <pthread.h>
|
||||||
|
|
||||||
|
|
@ -4,14 +4,14 @@
|
||||||
ANDROID_VERSIONCODE ?= 50000
|
ANDROID_VERSIONCODE ?= 50000
|
||||||
ANDROID_VERSIONNAME ?= 0.4
|
ANDROID_VERSIONNAME ?= 0.4
|
||||||
|
|
||||||
PATH_DIST = $(srcdir)/dists/android
|
PATH_DIST = $(srcdir)/dists/android3d
|
||||||
|
|
||||||
PORT_DISTFILES = $(PATH_DIST)/README.Android
|
PORT_DISTFILES = $(PATH_DIST)/README.Android
|
||||||
DIST_ANDROID_CONTROLS = $(PATH_DIST)/assets/arrows.tga
|
DIST_ANDROID_CONTROLS = $(PATH_DIST)/assets/arrows.tga
|
||||||
GRADLE = $(PATH_DIST)/gradlew
|
GRADLE = $(PATH_DIST)/gradlew
|
||||||
|
|
||||||
|
|
||||||
PATH_BUILD = ./android
|
PATH_BUILD = ./android3d
|
||||||
PATH_BUILD_ASSETS = $(PATH_BUILD)/assets
|
PATH_BUILD_ASSETS = $(PATH_BUILD)/assets
|
||||||
PATH_BUILD_JNI = $(PATH_BUILD)/jni/$(ABI)/libresidualvm.so
|
PATH_BUILD_JNI = $(PATH_BUILD)/jni/$(ABI)/libresidualvm.so
|
||||||
PATH_BUILD_GRADLE = $(PATH_BUILD)/settings.gradle
|
PATH_BUILD_GRADLE = $(PATH_BUILD)/settings.gradle
|
||||||
|
|
@ -32,8 +32,8 @@
|
||||||
#include "common/debug.h"
|
#include "common/debug.h"
|
||||||
#include "common/textconsole.h"
|
#include "common/textconsole.h"
|
||||||
|
|
||||||
#include "backends/platform/android/jni-android.h"
|
#include "backends/platform/android3d/jni-android.h"
|
||||||
#include "backends/platform/android/asset-archive.h"
|
#include "backends/platform/android3d/asset-archive.h"
|
||||||
|
|
||||||
#include <android/asset_manager.h>
|
#include <android/asset_manager.h>
|
||||||
#include <android/asset_manager_jni.h>
|
#include <android/asset_manager_jni.h>
|
||||||
|
|
@ -39,10 +39,10 @@
|
||||||
// for the Android port
|
// for the Android port
|
||||||
#define FORBIDDEN_SYMBOL_EXCEPTION_printf
|
#define FORBIDDEN_SYMBOL_EXCEPTION_printf
|
||||||
|
|
||||||
#include "backends/platform/android/android.h"
|
#include "backends/platform/android3d/android.h"
|
||||||
#include "backends/platform/android/graphics.h"
|
#include "backends/platform/android3d/graphics.h"
|
||||||
#include "backends/platform/android/events.h"
|
#include "backends/platform/android3d/events.h"
|
||||||
#include "backends/platform/android/jni-android.h"
|
#include "backends/platform/android3d/jni-android.h"
|
||||||
|
|
||||||
#include "engines/engine.h"
|
#include "engines/engine.h"
|
||||||
#include "gui/gui-manager.h"
|
#include "gui/gui-manager.h"
|
||||||
|
|
@ -44,10 +44,10 @@
|
||||||
#include "graphics/opengl/shader.h"
|
#include "graphics/opengl/shader.h"
|
||||||
#include "graphics/opengl/context.h"
|
#include "graphics/opengl/context.h"
|
||||||
|
|
||||||
#include "backends/platform/android/android.h"
|
#include "backends/platform/android3d/android.h"
|
||||||
#include "backends/platform/android/events.h"
|
#include "backends/platform/android3d/events.h"
|
||||||
#include "backends/platform/android/graphics.h"
|
#include "backends/platform/android3d/graphics.h"
|
||||||
#include "backends/platform/android/jni-android.h"
|
#include "backends/platform/android3d/jni-android.h"
|
||||||
|
|
||||||
AndroidGraphicsManager::AndroidGraphicsManager() :
|
AndroidGraphicsManager::AndroidGraphicsManager() :
|
||||||
_screenChangeID(0),
|
_screenChangeID(0),
|
||||||
|
|
@ -49,9 +49,9 @@
|
||||||
#include "common/encoding.h"
|
#include "common/encoding.h"
|
||||||
#include "engines/engine.h"
|
#include "engines/engine.h"
|
||||||
|
|
||||||
#include "backends/platform/android/android.h"
|
#include "backends/platform/android3d/android.h"
|
||||||
#include "backends/platform/android/asset-archive.h"
|
#include "backends/platform/android3d/asset-archive.h"
|
||||||
#include "backends/platform/android/jni-android.h"
|
#include "backends/platform/android3d/jni-android.h"
|
||||||
|
|
||||||
__attribute__ ((visibility("default")))
|
__attribute__ ((visibility("default")))
|
||||||
jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
|
jint JNICALL JNI_OnLoad(JavaVM *vm, void *) {
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
MODULE := backends/platform/android
|
MODULE := backends/platform/android3d
|
||||||
|
|
||||||
MODULE_OBJS := \
|
MODULE_OBJS := \
|
||||||
jni-android.o \
|
jni-android.o \
|
||||||
|
|
@ -203,7 +203,7 @@
|
||||||
// for the Android port
|
// for the Android port
|
||||||
#define FORBIDDEN_SYMBOL_EXCEPTION_printf
|
#define FORBIDDEN_SYMBOL_EXCEPTION_printf
|
||||||
|
|
||||||
#include "backends/platform/android/portdefs.h"
|
#include "backends/platform/android3d/portdefs.h"
|
||||||
|
|
||||||
#include <errno.h> /* For ERANGE and errno. */
|
#include <errno.h> /* For ERANGE and errno. */
|
||||||
#include <limits.h> /* For *_MAX. */
|
#include <limits.h> /* For *_MAX. */
|
||||||
|
|
@ -48,9 +48,9 @@
|
||||||
#include "common/array.h"
|
#include "common/array.h"
|
||||||
#include "common/util.h"
|
#include "common/util.h"
|
||||||
|
|
||||||
#include "backends/platform/android/texture.h"
|
#include "backends/platform/android3d/texture.h"
|
||||||
#include "backends/platform/android/android.h"
|
#include "backends/platform/android3d/android.h"
|
||||||
#include "backends/platform/android/jni-android.h"
|
#include "backends/platform/android3d/jni-android.h"
|
||||||
|
|
||||||
// Supported GL extensions
|
// Supported GL extensions
|
||||||
static bool npot_supported = false;
|
static bool npot_supported = false;
|
||||||
|
|
@ -45,10 +45,10 @@
|
||||||
#include "common/archive.h"
|
#include "common/archive.h"
|
||||||
#include "image/tga.h"
|
#include "image/tga.h"
|
||||||
|
|
||||||
#include "backends/platform/android/android.h"
|
#include "backends/platform/android3d/android.h"
|
||||||
#include "backends/platform/android/events.h"
|
#include "backends/platform/android3d/events.h"
|
||||||
#include "backends/platform/android/texture.h"
|
#include "backends/platform/android3d/texture.h"
|
||||||
#include "backends/platform/android/touchcontrols.h"
|
#include "backends/platform/android3d/touchcontrols.h"
|
||||||
|
|
||||||
static Common::Rect clipFor(const Common::KeyCode &cs) {
|
static Common::Rect clipFor(const Common::KeyCode &cs) {
|
||||||
switch (cs) {
|
switch (cs) {
|
||||||
|
|
@ -27,8 +27,8 @@
|
||||||
|
|
||||||
#include "common/events.h"
|
#include "common/events.h"
|
||||||
|
|
||||||
#include "backends/platform/android/events.h"
|
#include "backends/platform/android3d/events.h"
|
||||||
#include "backends/platform/android/texture.h"
|
#include "backends/platform/android3d/texture.h"
|
||||||
|
|
||||||
class TouchControls {
|
class TouchControls {
|
||||||
public:
|
public:
|
||||||
7
configure
vendored
|
|
@ -1972,7 +1972,7 @@ if test "$_host_os" = android; then
|
||||||
|
|
||||||
# Check that we have the correct NDK version
|
# Check that we have the correct NDK version
|
||||||
echo_n "Checking NDK version... "
|
echo_n "Checking NDK version... "
|
||||||
_ndk_gradle=$(grep "^[[:space:]]*ndkVersion" $_srcdir/dists/android/build.gradle | sed 's/[^0-9\.]//g')
|
_ndk_gradle=$(grep "^[[:space:]]*ndkVersion" $_srcdir/dists/android3d/build.gradle | sed 's/[^0-9\.]//g') # ResidualVM
|
||||||
_ndk_version=$(grep "Pkg.Revision" $ANDROID_NDK_ROOT/source.properties | sed 's/[^0-9\.]//g' | sed 's/.//')
|
_ndk_version=$(grep "Pkg.Revision" $ANDROID_NDK_ROOT/source.properties | sed 's/[^0-9\.]//g' | sed 's/.//')
|
||||||
if test "$_ndk_version" = "$_ndk_gradle"; then
|
if test "$_ndk_version" = "$_ndk_gradle"; then
|
||||||
echo "$_ndk_version"
|
echo "$_ndk_version"
|
||||||
|
|
@ -3212,7 +3212,7 @@ if test -n "$_host"; then
|
||||||
HOSTEXEPRE=lib
|
HOSTEXEPRE=lib
|
||||||
HOSTEXEEXT=.so
|
HOSTEXEEXT=.so
|
||||||
_backend="android"
|
_backend="android"
|
||||||
_port_mk="backends/platform/android/android.mk"
|
_port_mk="backends/platform/android3d/android.mk" # ResidualVM
|
||||||
_build_scalers=no
|
_build_scalers=no
|
||||||
_seq_midi=no
|
_seq_midi=no
|
||||||
_timidity=no
|
_timidity=no
|
||||||
|
|
@ -3614,7 +3614,7 @@ case $_backend in
|
||||||
android)
|
android)
|
||||||
append_var DEFINES "-DREDUCE_MEMORY_USAGE"
|
append_var DEFINES "-DREDUCE_MEMORY_USAGE"
|
||||||
append_var DEFINES "-DNONSTANDARD_PORT"
|
append_var DEFINES "-DNONSTANDARD_PORT"
|
||||||
append_var INCLUDES '-I$(srcdir)/backends/platform/android'
|
append_var INCLUDES '-I$(srcdir)/backends/platform/android3d' # ResidualVM
|
||||||
append_var CXXFLAGS "-Wa,--noexecstack"
|
append_var CXXFLAGS "-Wa,--noexecstack"
|
||||||
append_var LDFLAGS "-Wl,-z,noexecstack"
|
append_var LDFLAGS "-Wl,-z,noexecstack"
|
||||||
# removed the following directive - was causing compilation issues when not also explicitly using --disable-mt32emu
|
# removed the following directive - was causing compilation issues when not also explicitly using --disable-mt32emu
|
||||||
|
|
@ -3623,6 +3623,7 @@ case $_backend in
|
||||||
if test "$_host" = ouya; then
|
if test "$_host" = ouya; then
|
||||||
_sdlnet=no
|
_sdlnet=no
|
||||||
fi
|
fi
|
||||||
|
append_var MODULES "backends/platform/android3d" # ResidualVM
|
||||||
;;
|
;;
|
||||||
androidsdl)
|
androidsdl)
|
||||||
_sdl=auto
|
_sdl=auto
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 512 KiB After Width: | Height: | Size: 512 KiB |
|
|
@ -14,7 +14,7 @@ allprojects {
|
||||||
google()
|
google()
|
||||||
jcenter()
|
jcenter()
|
||||||
}
|
}
|
||||||
buildDir = "${gradle.buildDir}/android/build"
|
buildDir = "${gradle.buildDir}/android3d/build"
|
||||||
}
|
}
|
||||||
|
|
||||||
apply plugin: 'com.android.application'
|
apply plugin: 'com.android.application'
|
||||||
|
|
@ -41,11 +41,11 @@ android {
|
||||||
|
|
||||||
sourceSets {
|
sourceSets {
|
||||||
main {
|
main {
|
||||||
assets.srcDirs = ["${gradle.buildDir}/android/assets"]
|
assets.srcDirs = ["${gradle.buildDir}/android3d/assets"]
|
||||||
java.srcDirs = ["${gradle.sourceDir}/backends/platform/android"]
|
java.srcDirs = ["${gradle.sourceDir}/backends/platform/android3d"]
|
||||||
res.srcDirs = ["${gradle.sourceDir}/dists/android/res"]
|
res.srcDirs = ["${gradle.sourceDir}/dists/android3d/res"]
|
||||||
manifest.srcFile "${gradle.sourceDir}/dists/android/AndroidManifest.xml"
|
manifest.srcFile "${gradle.sourceDir}/dists/android3d/AndroidManifest.xml"
|
||||||
jniLibs.srcDirs = ["${gradle.buildDir}/android/jni"]
|
jniLibs.srcDirs = ["${gradle.buildDir}/android3d/jni"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ("KEYSTORE" in System.env) {
|
if ("KEYSTORE" in System.env) {
|
||||||
|
Before Width: | Height: | Size: 395 B After Width: | Height: | Size: 395 B |
|
Before Width: | Height: | Size: 437 B After Width: | Height: | Size: 437 B |
|
Before Width: | Height: | Size: 394 B After Width: | Height: | Size: 394 B |
|
Before Width: | Height: | Size: 310 B After Width: | Height: | Size: 310 B |
|
Before Width: | Height: | Size: 553 B After Width: | Height: | Size: 553 B |
|
Before Width: | Height: | Size: 471 B After Width: | Height: | Size: 471 B |
|
Before Width: | Height: | Size: 628 B After Width: | Height: | Size: 628 B |
|
Before Width: | Height: | Size: 672 B After Width: | Height: | Size: 672 B |
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.5 KiB |
|
Before Width: | Height: | Size: 25 KiB After Width: | Height: | Size: 25 KiB |