Amiberry GUI on Android comes up (#563)

* Uses C++14 standard lib instead of GNU

GNU lead to compilation errors.

* Removes variables

Those are in the main Android.mk now and relative.

* Creates header file for amiberry_filesys for reuse in other files

* Adds prefix_with_application_directory_path for Android support

* Uses path prefixer to fix some crashes on Android

* Adds pattern for Android Studio (jetbrains) working file

* Removes unused compiler directive LIBMPEG2_PATH from Makefile

* Fixes startup behavior for Android

We are using the applications directory as our working directory now,
because SDCARD access will be limited in the future of Android.
Coming with that, we're also relying on `start_path_data` being
set correctly at startup instead of working around it during
loading of settings.

* Workaround for crash during startup

* Workaround for another crash during startup on Android

* Adds new code file scp.cpp to Android build

* Adds orig files to gitignore

* Fixes behaviour of prefix_with_application_directory_path

* Enables redirection of logs to Android's logcat

* Fixes misspelled compiler directive
This commit is contained in:
bspinner 2019-12-23 10:39:46 +01:00 committed by Dimitris Panokostas
parent 8b15040881
commit a57736e2cd
11 changed files with 104 additions and 42 deletions

View file

@ -12,10 +12,6 @@ include $(CLEAR_VARS)
LOCAL_MODULE := amiberry
SDL_PATH := D:/Github/amiberry-android/app/jni/SDL
#LIBMPEG2_PATH := ../mpeg2
LIBPNG_PATH := D:/Github/amiberry-android/app/jni/SDL_image/external/libpng-1.6.37
LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
$(LOCAL_PATH)/src/osdep \
$(LOCAL_PATH)/src/threaddep \
@ -33,7 +29,8 @@ else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
LOCAL_CFLAGS := -DCPU_AARCH64 -DAMIBERRY -D_FILE_OFFSET_BITS=64 -DSTATIC_LIBXML
endif
LOCAL_CPPFLAGS := -std=gnu++14 -pipe -frename-registers \
#LOCAL_CPPFLAGS := -std=gnu++14 -pipe -frename-registers
LOCAL_CPPFLAGS := -std=c++14 -pipe -frename-registers \
-Wno-shift-overflow -Wno-narrowing
LOCAL_LDFLAGS += -fuse-ld=gold
@ -89,6 +86,7 @@ LOCAL_SRC_FILES := src/archivers/7z/BraIA64.c \
src/rommgr.cpp \
src/rtc.cpp \
src/savestate.cpp \
src/scp.cpp \
src/scsi.cpp \
src/statusline.cpp \
src/traps.cpp \