From c02d2ce8bca484d2d14f89e438301a76c4563f04 Mon Sep 17 00:00:00 2001 From: Dimitris Panokostas Date: Sun, 10 Dec 2023 15:44:48 +0100 Subject: [PATCH] Removed obsolete Android-specific parts --- Android.mk | 286 ------------------------ external/libguisan/Android.mk | 25 --- src/fsusage.cpp | 8 +- src/osdep/amiberry.cpp | 5 +- src/osdep/amiberry_gfx.cpp | 4 - src/osdep/amiberry_mem.cpp | 4 - src/osdep/bsdsocket_host.cpp | 8 +- src/osdep/config.h | 4 - src/osdep/gui/CreateFilesysHardfile.cpp | 8 - src/osdep/gui/EditFilesysHardDrive.cpp | 8 - src/osdep/gui/EditFilesysHardfile.cpp | 4 - src/osdep/gui/EditFilesysVirtual.cpp | 8 - src/osdep/gui/PanelRAM.cpp | 7 +- src/osdep/gui/PanelRTG.cpp | 7 +- src/osdep/gui/SelectFile.cpp | 8 - src/osdep/gui/SelectFolder.cpp | 8 - src/osdep/gui/ShowDiskInfo.cpp | 4 - src/osdep/gui/ShowHelp.cpp | 8 - src/osdep/gui/gui_handling.h | 7 - src/osdep/gui/main_window.cpp | 12 +- src/osdep/sigsegv_handler.cpp | 8 +- src/osdep/writelog.cpp | 10 - src/sounddep/sound.cpp | 4 - 23 files changed, 9 insertions(+), 446 deletions(-) delete mode 100644 Android.mk delete mode 100644 external/libguisan/Android.mk diff --git a/Android.mk b/Android.mk deleted file mode 100644 index 1d5f12af0..000000000 --- a/Android.mk +++ /dev/null @@ -1,286 +0,0 @@ -AMIBERRY_LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) -LOCAL_PATH := $(AMIBERRY_LOCAL_PATH) - -include $(LOCAL_PATH)/external/libguisan/Android.mk -LOCAL_PATH := $(AMIBERRY_LOCAL_PATH) -include $(CLEAR_VARS) - -include $(LOCAL_PATH)/external/libxml2/Android.mk -LOCAL_PATH := $(AMIBERRY_LOCAL_PATH) -include $(CLEAR_VARS) - -LOCAL_MODULE := amiberry - -LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \ - $(LOCAL_PATH)/src/osdep \ - $(LOCAL_PATH)/src/threaddep \ - $(LOCAL_PATH)/src/include \ - $(LOCAL_PATH)/src/archivers \ - $(LOCAL_PATH)/external/libguisan/include \ - $(SDL_PATH)/include \ - $(LIBPNG_PATH) \ - -ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) - LOCAL_ARM_NEON := true - LOCAL_CFLAGS := -DCPU_arm -DARM_HAS_DIV -DARMV6T2 -DARMV6_ASSEMBLY -DAMIBERRY -D_FILE_OFFSET_BITS=64 -DUSE_ARMNEON -DSTATIC_LIBXML -else ifeq ($(TARGET_ARCH_ABI),arm64-v8a) - LOCAL_CFLAGS := -DCPU_AARCH64 -DAMIBERRY -D_FILE_OFFSET_BITS=64 -endif - -#LOCAL_CPPFLAGS := -std=gnu++14 -pipe -frename-registers -LOCAL_CPPFLAGS := -std=c++17 -pipe -frename-registers \ - -Wno-shift-overflow -Wno-narrowing - -LOCAL_LDFLAGS += -fuse-ld=gold - -# Add your application source files here... -LOCAL_SRC_FILES := src/akiko.cpp \ - src/ar.cpp \ - src/audio.cpp \ - src/autoconf.cpp \ - src/blitfunc.cpp \ - src/blittable.cpp \ - src/blitter.cpp \ - src/blkdev.cpp \ - src/blkdev_cdimage.cpp \ - src/bsdsocket.cpp \ - src/calc.cpp \ - src/cdrom.cpp \ - src/cdtv.cpp \ - src/cdtvcr.cpp \ - src/cfgfile.cpp \ - src/cia.cpp \ - src/consolehook.cpp \ - src/crc32.cpp \ - src/custom.cpp \ - src/debug.cpp \ - src/def_icons.cpp \ - src/devices.cpp \ - src/disk.cpp \ - src/diskutil.cpp \ - src/dlopen.cpp \ - src/dongle.cpp \ - src/drawing.cpp \ - src/driveclick.cpp \ - src/events.cpp \ - src/expansion.cpp \ - src/fdi2raw.cpp \ - src/filesys.cpp \ - src/flashrom.cpp \ - src/fpp.cpp \ - src/fsdb.cpp \ - src/fsusage.cpp \ - src/gayle.cpp \ - src/gfxboard.cpp \ - src/gfxutil.cpp \ - src/hardfile.cpp \ - src/hrtmon.rom.cpp \ - src/ide.cpp \ - src/ini.cpp \ - src/inputdevice.cpp \ - src/inputrecord.cpp \ - src/isofs.cpp \ - src/keybuf.cpp \ - src/main.cpp \ - src/memory.cpp \ - src/native2amiga.cpp \ - src/parser.cpp \ - src/rommgr.cpp \ - src/rtc.cpp \ - src/savestate.cpp \ - src/scp.cpp \ - src/scsi.cpp \ - src/scsiemul.cpp \ - src/scsitape.cpp \ - src/statusline.cpp \ - src/tabletlibrary.cpp \ - src/tinyxml2.cpp \ - src/traps.cpp \ - src/uaeexe.cpp \ - src/uaelib.cpp \ - src/uaeserial.cpp \ - src/uaenative.cpp \ - src/uaeresource.cpp \ - src/zfile.cpp \ - src/zfile_archive.cpp \ - src/archivers/7z/7zAlloc.c \ - src/archivers/7z/7zArcIn.c \ - src/archivers/7z/7zBuf.c \ - src/archivers/7z/7zBuf2.c \ - src/archivers/7z/7zCrc.c \ - src/archivers/7z/7zCrcOpt.c \ - src/archivers/7z/7zDec.c \ - src/archivers/7z/7zFile.c \ - src/archivers/7z/7zStream.c \ - src/archivers/7z/Aes.c \ - src/archivers/7z/AesOpt.c \ - src/archivers/7z/Alloc.c \ - src/archivers/7z/Bcj2.c \ - src/archivers/7z/Bra.c \ - src/archivers/7z/Bra86.c \ - src/archivers/7z/BraIA64.c \ - src/archivers/7z/CpuArch.c \ - src/archivers/7z/Delta.c \ - src/archivers/7z/LzFind.c \ - src/archivers/7z/Lzma2Dec.c \ - src/archivers/7z/Lzma2Enc.c \ - src/archivers/7z/Lzma86Dec.c \ - src/archivers/7z/Lzma86Enc.c \ - src/archivers/7z/LzmaDec.c \ - src/archivers/7z/LzmaEnc.c \ - src/archivers/7z/LzmaLib.c \ - src/archivers/7z/Ppmd7.c \ - src/archivers/7z/Ppmd7Dec.c \ - src/archivers/7z/Ppmd7Enc.c \ - src/archivers/7z/Sha256.c \ - src/archivers/7z/Sort.c \ - src/archivers/7z/Xz.c \ - src/archivers/7z/XzCrc64.c \ - src/archivers/7z/XzCrc64Opt.c \ - src/archivers/7z/XzDec.c \ - src/archivers/7z/XzEnc.c \ - src/archivers/7z/XzIn.c \ - src/archivers/chd/avhuff.cpp \ - src/archivers/chd/bitmap.cpp \ - src/archivers/chd/cdrom.cpp \ - src/archivers/chd/chd.cpp \ - src/archivers/chd/chdcd.cpp \ - src/archivers/chd/chdcodec.cpp \ - src/archivers/chd/corealloc.cpp \ - src/archivers/chd/corefile.cpp \ - src/archivers/chd/corestr.cpp \ - src/archivers/chd/flac.cpp \ - src/archivers/chd/harddisk.cpp \ - src/archivers/chd/hashing.cpp \ - src/archivers/chd/huffman.cpp \ - src/archivers/chd/md5.cpp \ - src/archivers/chd/osdcore.cpp \ - src/archivers/chd/osdlib_unix.cpp \ - src/archivers/chd/osdsync.cpp \ - src/archivers/chd/palette.cpp \ - src/archivers/chd/posixdir.cpp \ - src/archivers/chd/posixfile.cpp \ - src/archivers/chd/posixptty.cpp \ - src/archivers/chd/posixsocket.cpp \ - src/archivers/chd/strconv.cpp \ - src/archivers/chd/strformat.cpp \ - src/archivers/chd/unicode.cpp \ - src/archivers/chd/vecstream.cpp \ - src/archivers/chd/utf8proc.c \ - src/archivers/dms/crc_csum.cpp \ - src/archivers/dms/getbits.cpp \ - src/archivers/dms/maketbl.cpp \ - src/archivers/dms/pfile.cpp \ - src/archivers/dms/tables.cpp \ - src/archivers/dms/u_deep.cpp \ - src/archivers/dms/u_heavy.cpp \ - src/archivers/dms/u_init.cpp \ - src/archivers/dms/u_medium.cpp \ - src/archivers/dms/u_quick.cpp \ - src/archivers/dms/u_rle.cpp \ - src/archivers/lha/crcio.cpp \ - src/archivers/lha/dhuf.cpp \ - src/archivers/lha/header.cpp \ - src/archivers/lha/huf.cpp \ - src/archivers/lha/larc.cpp \ - src/archivers/lha/lhamaketbl.cpp \ - src/archivers/lha/lharc.cpp \ - src/archivers/lha/shuf.cpp \ - src/archivers/lha/slide.cpp \ - src/archivers/lha/uae_lha.cpp \ - src/archivers/lha/util.cpp \ - src/archivers/lzx/unlzx.cpp \ - src/archivers/mp2/kjmp2.cpp \ - src/archivers/wrp/warp.cpp \ - src/archivers/zip/unzip.cpp \ - src/caps/caps_amiberry.cpp \ - src/machdep/support.cpp \ - src/floppybridge/floppybridge_lib.cpp \ - src/osdep/ahi_v1.cpp \ - src/osdep/bsdsocket_host.cpp \ - src/osdep/cda_play.cpp \ - src/osdep/charset.cpp \ - src/osdep/fsdb_host.cpp \ - src/osdep/clipboard.cpp \ - src/osdep/amiberry_hardfile.cpp \ - src/osdep/keyboard.cpp \ - src/osdep/mp3decoder.cpp \ - src/osdep/picasso96.cpp \ - src/osdep/writelog.cpp \ - src/osdep/amiberry.cpp \ - src/osdep/ahi_v2.cpp \ - src/osdep/amiberry_filesys.cpp \ - src/osdep/amiberry_input.cpp \ - src/osdep/amiberry_gfx.cpp \ - src/osdep/amiberry_gui.cpp \ - src/osdep/amiberry_mem.cpp \ - src/osdep/amiberry_serial.cpp \ - src/osdep/amiberry_whdbooter.cpp \ - src/osdep/sigsegv_handler.cpp \ - src/osdep/retroarch.cpp \ - src/sounddep/sound.cpp \ - src/threaddep/threading.cpp \ - src/osdep/gui/SelectorEntry.cpp \ - src/osdep/gui/ShowHelp.cpp \ - src/osdep/gui/ShowMessage.cpp \ - src/osdep/gui/ShowDiskInfo.cpp \ - src/osdep/gui/SelectFolder.cpp \ - src/osdep/gui/SelectFile.cpp \ - src/osdep/gui/CreateFilesysHardfile.cpp \ - src/osdep/gui/EditFilesysVirtual.cpp \ - src/osdep/gui/EditFilesysHardfile.cpp \ - src/osdep/gui/EditFilesysHardDrive.cpp \ - src/osdep/gui/PanelAbout.cpp \ - src/osdep/gui/PanelPaths.cpp \ - src/osdep/gui/PanelQuickstart.cpp \ - src/osdep/gui/PanelConfig.cpp \ - src/osdep/gui/PanelCPU.cpp \ - src/osdep/gui/PanelChipset.cpp \ - src/osdep/gui/PanelCustom.cpp \ - src/osdep/gui/PanelROM.cpp \ - src/osdep/gui/PanelRAM.cpp \ - src/osdep/gui/PanelFloppy.cpp \ - src/osdep/gui/PanelExpansions.cpp \ - src/osdep/gui/PanelHD.cpp \ - src/osdep/gui/PanelRTG.cpp \ - src/osdep/gui/PanelHWInfo.cpp \ - src/osdep/gui/PanelInput.cpp \ - src/osdep/gui/PanelIOPorts.cpp \ - src/osdep/gui/PanelDisplay.cpp \ - src/osdep/gui/PanelSound.cpp \ - src/osdep/gui/PanelDiskSwapper.cpp \ - src/osdep/gui/PanelMisc.cpp \ - src/osdep/gui/PanelPrio.cpp \ - src/osdep/gui/PanelSavestate.cpp \ - src/osdep/gui/main_window.cpp \ - src/osdep/gui/Navigation.cpp \ - src/osdep/vkbd/vkbd.cpp - -ifeq ($(TARGET_ARCH_ABI),arm64-v8a) - LOCAL_SRC_FILES += src/osdep/aarch64_helper_min.s -else ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) - LOCAL_SRC_FILES += src/osdep/arm_helper.s -endif - -LOCAL_SRC_FILES += src/newcpu.cpp \ - src/newcpu_common.cpp \ - src/readcpu.cpp \ - src/cpudefs.cpp \ - src/cpustbl.cpp \ - src/cpuemu_0.cpp \ - src/cpuemu_4.cpp \ - src/cpuemu_11.cpp \ - src/cpuemu_13.cpp \ - src/cpuemu_40.cpp \ - src/cpuemu_44.cpp \ - src/jit/compemu.cpp \ - src/jit/compstbl.cpp \ - src/jit/compemu_fpp.cpp \ - src/jit/compemu_support.cpp - -LOCAL_SHARED_LIBRARIES := SDL2 SDL2_image SDL2_ttf SDL2_mixer mpg123 guisan serialport - -LOCAL_LDLIBS := -ldl -lGLESv1_CM -lGLESv2 -llog -lz - -include $(BUILD_SHARED_LIBRARY) diff --git a/external/libguisan/Android.mk b/external/libguisan/Android.mk deleted file mode 100644 index b6bd0bed2..000000000 --- a/external/libguisan/Android.mk +++ /dev/null @@ -1,25 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := guisan - -LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/../SDL/include $(LOCAL_PATH)/include \ - $(LOCAL_PATH)/../SDL_image $(LOCAL_PATH)/../SDL_ttf/include -LOCAL_CFLAGS := -DHAVE_CONFIG_H -D_GNU_SOURCE=1 -D_REENTRANT -fexceptions -frtti - -LOCAL_SRC_FILES := \ - $(wildcard $(LOCAL_PATH)/src/*.cpp) \ - $(wildcard $(LOCAL_PATH)/src/sdl/*.cpp) \ - $(wildcard $(LOCAL_PATH)/src/widgets/*.cpp) - -#$(wildcard $(LOCAL_PATH)/src/opengl/*.cpp) \ - -LOCAL_SHARED_LIBRARIES += SDL2 SDL2_image SDL2_ttf - -LOCAL_STATIC_LIBRARIES := - -LOCAL_LDLIBS := -llog - -include $(BUILD_SHARED_LIBRARY) -#include $(BUILD_STATIC_LIBRARY) \ No newline at end of file diff --git a/src/fsusage.cpp b/src/fsusage.cpp index f83302f3f..0ac26b6be 100644 --- a/src/fsusage.cpp +++ b/src/fsusage.cpp @@ -18,7 +18,7 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "sysconfig.h" #include "sysdeps.h" -#include +#include #include #ifdef HAVE_SYS_STAT_H @@ -294,15 +294,9 @@ int get_fs_usage (const TCHAR *path, const TCHAR *disk, struct fs_usage *fsp) #ifdef STAT_STATVFS /* SVR4 */ # define CONVERT_BLOCKS(B) \ adjust_blocks ((B), fsd.f_frsize ? fsd.f_frsize : fsd.f_bsize, 512) -#ifdef ANDROID - struct statfs fsd; - if (statfs (path, &fsd) < 0) -#else struct statvfs fsd{}; - if (statvfs (path, &fsd) < 0) -#endif return -1; /* f_frsize isn't guaranteed to be supported. */ diff --git a/src/osdep/amiberry.cpp b/src/osdep/amiberry.cpp index 017721805..d7d49b0a4 100644 --- a/src/osdep/amiberry.cpp +++ b/src/osdep/amiberry.cpp @@ -15,10 +15,7 @@ #include #include -#ifndef ANDROID #include -#endif - #include "sysdeps.h" #include "options.h" #include "audio.h" @@ -4031,7 +4028,7 @@ int main(int argc, char* argv[]) ClearAvailableROMList(); romlist_clear(); free_keyring(); - //free_AmigaMem(); + lstMRUDiskList.clear(); lstMRUCDList.clear(); lstMRUWhdloadList.clear(); diff --git a/src/osdep/amiberry_gfx.cpp b/src/osdep/amiberry_gfx.cpp index 1f483662e..dc1f81cae 100644 --- a/src/osdep/amiberry_gfx.cpp +++ b/src/osdep/amiberry_gfx.cpp @@ -90,10 +90,6 @@ SDL_Rect renderQuad; static int dx = 0, dy = 0; const char* sdl_video_driver; -#ifdef ANDROID -#include -#endif - static int display_width; static int display_height; static int display_depth; diff --git a/src/osdep/amiberry_mem.cpp b/src/osdep/amiberry_mem.cpp index 7fb9d3f7a..89a78bd58 100644 --- a/src/osdep/amiberry_mem.cpp +++ b/src/osdep/amiberry_mem.cpp @@ -20,10 +20,6 @@ #include "sys/sysinfo.h" #endif -#ifdef ANDROID -#define valloc(x) memalign(getpagesize(), x) -#endif - #ifdef __APPLE__ #include #endif diff --git a/src/osdep/bsdsocket_host.cpp b/src/osdep/bsdsocket_host.cpp index 76970b575..8b69668b3 100644 --- a/src/osdep/bsdsocket_host.cpp +++ b/src/osdep/bsdsocket_host.cpp @@ -44,17 +44,13 @@ #endif #include #include -#include +#include #include -#include +#include #include - #define WAITSIGNAL waitsig (ctx, sb) -#ifdef ANDROID -#define IPPROTO_ENCAP 98 -#endif /* Sigqueue is unsafe on SMP machines. * Temporary work-around. diff --git a/src/osdep/config.h b/src/osdep/config.h index 384c5aa30..a43dd5135 100644 --- a/src/osdep/config.h +++ b/src/osdep/config.h @@ -41,11 +41,7 @@ * Virtual Key for (Left shoulder) button * default: RSHIFT (303) */ -#ifdef ANDROID -#define VK_L SDLK_F13 -#else #define VK_LShoulder SDLK_RSHIFT -#endif /* * Virtual Key for (Right shoulder) button diff --git a/src/osdep/gui/CreateFilesysHardfile.cpp b/src/osdep/gui/CreateFilesysHardfile.cpp index 4cb6f88b6..00a693ffb 100644 --- a/src/osdep/gui/CreateFilesysHardfile.cpp +++ b/src/osdep/gui/CreateFilesysHardfile.cpp @@ -15,10 +15,6 @@ #include "amiberry_gfx.h" #include "amiberry_input.h" -#ifdef ANDROID -#include "androidsdl_event.h" -#endif - #define DIALOG_WIDTH 620 #define DIALOG_HEIGHT 202 @@ -464,11 +460,7 @@ static void CreateFilesysHardfileLoop() //------------------------------------------------- // Send event to gui-controls //------------------------------------------------- -#ifdef ANDROID - androidsdl_event(event, gui_input); -#else gui_input->pushInput(event); -#endif } if (got_event) diff --git a/src/osdep/gui/EditFilesysHardDrive.cpp b/src/osdep/gui/EditFilesysHardDrive.cpp index 67516fbd4..c3591b540 100644 --- a/src/osdep/gui/EditFilesysHardDrive.cpp +++ b/src/osdep/gui/EditFilesysHardDrive.cpp @@ -17,10 +17,6 @@ #include "amiberry_gfx.h" #include "amiberry_input.h" -#ifdef ANDROID -#include "androidsdl_event.h" -#endif - #define DIALOG_WIDTH 600 #define DIALOG_HEIGHT 200 @@ -391,11 +387,7 @@ static void EditFilesysHardDriveLoop() //------------------------------------------------- // Send event to guisan-controls //------------------------------------------------- -#ifdef ANDROID - androidsdl_event(event, gui_input); -#else gui_input->pushInput(event); -#endif } if (got_event) diff --git a/src/osdep/gui/EditFilesysHardfile.cpp b/src/osdep/gui/EditFilesysHardfile.cpp index 7c8526d81..f8c82438d 100644 --- a/src/osdep/gui/EditFilesysHardfile.cpp +++ b/src/osdep/gui/EditFilesysHardfile.cpp @@ -18,10 +18,6 @@ #include "amiberry_gfx.h" #include "amiberry_input.h" -#ifdef ANDROID -#include "androidsdl_event.h" -#endif - #define DIALOG_WIDTH 620 #define DIALOG_HEIGHT 280 diff --git a/src/osdep/gui/EditFilesysVirtual.cpp b/src/osdep/gui/EditFilesysVirtual.cpp index f3dcb2a0c..3ef2ac963 100644 --- a/src/osdep/gui/EditFilesysVirtual.cpp +++ b/src/osdep/gui/EditFilesysVirtual.cpp @@ -17,10 +17,6 @@ #include "amiberry_gfx.h" #include "amiberry_input.h" -#ifdef ANDROID -#include "androidsdl_event.h" -#endif - #define DIALOG_WIDTH 520 #define DIALOG_HEIGHT 202 @@ -486,11 +482,7 @@ static void EditFilesysVirtualLoop() //------------------------------------------------- // Send event to guisan-controls //------------------------------------------------- -#ifdef ANDROID - androidsdl_event(event, gui_input); -#else gui_input->pushInput(event); -#endif } if (got_event) diff --git a/src/osdep/gui/PanelRAM.cpp b/src/osdep/gui/PanelRAM.cpp index 4a6eaabb4..cc668e805 100644 --- a/src/osdep/gui/PanelRAM.cpp +++ b/src/osdep/gui/PanelRAM.cpp @@ -96,12 +96,7 @@ void InitPanelRAM(const config_category& category) { memorySliderActionListener = new MemorySliderActionListener(); const int sld_width = 150; - int marker_length; -#ifdef ANDROID - markerLength = 30; -#else - marker_length = 20; -#endif + int marker_length = 20; lblChipmem = new gcn::Label("Chip:"); sldChipmem = new gcn::Slider(0, 6); diff --git a/src/osdep/gui/PanelRTG.cpp b/src/osdep/gui/PanelRTG.cpp index 0fe0208a4..e827737be 100644 --- a/src/osdep/gui/PanelRTG.cpp +++ b/src/osdep/gui/PanelRTG.cpp @@ -198,13 +198,10 @@ void InitPanelRTG(const config_category& category) { int sld_width; int marker_length; -#ifdef ANDROID - sldWidth = 150; - markerLength = 30; -#else + sld_width = 110; marker_length = 20; -#endif + rtg_action_listener = new RTGActionListener(); lblBoard = new gcn::Label("Board:"); diff --git a/src/osdep/gui/SelectFile.cpp b/src/osdep/gui/SelectFile.cpp index c7dbe87a2..e0393dc50 100644 --- a/src/osdep/gui/SelectFile.cpp +++ b/src/osdep/gui/SelectFile.cpp @@ -21,10 +21,6 @@ #include "amiberry_gfx.h" #include "amiberry_input.h" -#ifdef ANDROID -#include "androidsdl_event.h" -#endif - #define DIALOG_WIDTH 520 #define DIALOG_HEIGHT 400 @@ -587,11 +583,7 @@ static void SelectFileLoop() //------------------------------------------------- // Send event to guisan-controls //------------------------------------------------- -#ifdef ANDROID - androidsdl_event(event, gui_input); -#else gui_input->pushInput(event); -#endif } if (got_event) diff --git a/src/osdep/gui/SelectFolder.cpp b/src/osdep/gui/SelectFolder.cpp index c750be800..2ed9e6a99 100644 --- a/src/osdep/gui/SelectFolder.cpp +++ b/src/osdep/gui/SelectFolder.cpp @@ -20,10 +20,6 @@ #include "amiberry_gfx.h" #include "amiberry_input.h" -#ifdef ANDROID -#include "androidsdl_event.h" -#endif - #define DIALOG_WIDTH 520 #define DIALOG_HEIGHT 400 @@ -499,11 +495,7 @@ static void SelectFolderLoop() //------------------------------------------------- // Send event to guisan-controls //------------------------------------------------- -#ifdef ANDROID - androidsdl_event(event, gui_input); -#else gui_input->pushInput(event); -#endif } if (got_event) diff --git a/src/osdep/gui/ShowDiskInfo.cpp b/src/osdep/gui/ShowDiskInfo.cpp index e0f0f83e0..d186c1d12 100644 --- a/src/osdep/gui/ShowDiskInfo.cpp +++ b/src/osdep/gui/ShowDiskInfo.cpp @@ -255,11 +255,7 @@ static void ShowDiskInfoLoop() //------------------------------------------------- // Send event to guisan-controls //------------------------------------------------- -#ifdef ANDROID - androidsdl_event(event, gui_input); -#else gui_input->pushInput(event); -#endif } if (got_event) diff --git a/src/osdep/gui/ShowHelp.cpp b/src/osdep/gui/ShowHelp.cpp index 6c54b0723..e6c6f065d 100644 --- a/src/osdep/gui/ShowHelp.cpp +++ b/src/osdep/gui/ShowHelp.cpp @@ -15,10 +15,6 @@ #include "amiberry_gfx.h" #include "amiberry_input.h" -#ifdef ANDROID -#include "androidsdl_event.h" -#endif - #define DIALOG_WIDTH 760 #define DIALOG_HEIGHT 440 @@ -275,11 +271,7 @@ static void ShowHelpLoop() //------------------------------------------------- // Send event to guisan-controls //------------------------------------------------- -#ifdef ANDROID - androidsdl_event(event, gui_input); -#else gui_input->pushInput(event); -#endif } if (got_event) diff --git a/src/osdep/gui/gui_handling.h b/src/osdep/gui/gui_handling.h index 2310a0e58..e7a1ba0ac 100644 --- a/src/osdep/gui/gui_handling.h +++ b/src/osdep/gui/gui_handling.h @@ -304,13 +304,6 @@ void ExitPanelVirtualKeyboard(); void RefreshPanelVirtualKeyboard(); bool HelpPanelVirtualKeyboard(std::vector& helptext); -#ifdef ANDROID -void InitPanelOnScreen(const struct _ConfigCategory& category); -void ExitPanelOnScreen(); -void RefreshPanelOnScreen(); -bool HelpPanelOnScreen(std::vector &helptext); -#endif - void refresh_all_panels(); void register_refresh_func(void (*func)()); diff --git a/src/osdep/gui/main_window.cpp b/src/osdep/gui/main_window.cpp index 0b033680c..2e1f79c97 100644 --- a/src/osdep/gui/main_window.cpp +++ b/src/osdep/gui/main_window.cpp @@ -26,11 +26,6 @@ #include "amiberry_input.h" #include "inputdevice.h" -#if defined(ANDROID) -#include "androidsdl_event.h" -#include -#endif - bool ctrl_state = false, shift_state = false, alt_state = false, win_state = false; int last_x = 0; int last_y = 0; @@ -95,9 +90,7 @@ ConfigCategory categories[] = { {"Virtual Keyboard", "keyboard.png", nullptr, nullptr, InitPanelVirtualKeyboard, ExitPanelVirtualKeyboard, RefreshPanelVirtualKeyboard, HelpPanelVirtualKeyboard }, -#ifdef ANDROID - { "OnScreen", "screen.ico", NULL, NULL, InitPanelOnScreen, ExitPanelOnScreen, RefreshPanelOnScreen, HelpPanelOnScreen }, -#endif + {nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr} }; @@ -124,9 +117,6 @@ enum PANEL_MISC, PANEL_SAVESTATES, PANEL_VIRTUAL_KEYBOARD, -#ifdef ANDROID - PANEL_ONSCREEN, -#endif NUM_PANELS }; diff --git a/src/osdep/sigsegv_handler.cpp b/src/osdep/sigsegv_handler.cpp index 865160c32..8382d808e 100644 --- a/src/osdep/sigsegv_handler.cpp +++ b/src/osdep/sigsegv_handler.cpp @@ -41,15 +41,9 @@ #else #include #endif -#include +#include #include -#ifndef ANDROID #include -#else -int backtrace(void**,int){ return 0; } -char** backtrace_symbols(void* const*,int){return NULL; } -void backtrace_symbols_fd(void* const*,int,int){} -#endif #include #ifdef JIT diff --git a/src/osdep/writelog.cpp b/src/osdep/writelog.cpp index cae4c7a3b..5144fc3fd 100644 --- a/src/osdep/writelog.cpp +++ b/src/osdep/writelog.cpp @@ -396,14 +396,6 @@ void write_log(const char* format, ...) { if (amiberry_options.write_logfile) { - // Redirect logging to Android's logcat -#ifdef ANDROID - va_list parms; - va_start(parms, format); - SDL_Log(format, parms); - va_end(parms); -#else - TCHAR buffer[WRITE_LOG_BUF_SIZE]; va_list parms{}; @@ -415,8 +407,6 @@ void write_log(const char* format, ...) fflush(debugfile); } va_end(parms); - -#endif } } diff --git a/src/sounddep/sound.cpp b/src/sounddep/sound.cpp index b8a264670..9318c7526 100644 --- a/src/sounddep/sound.cpp +++ b/src/sounddep/sound.cpp @@ -27,10 +27,6 @@ #include "cda_play.h" -#ifdef ANDROID -#include -#endif - struct sound_dp { SDL_AudioDeviceID dev;