pandory500/redquark-amiberry-rb
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed unneeded define ANDROIDSDL (we can use ANDROID)

Browse source
This commit is contained in:
Dimitris Panokostas 2019-10-18 19:14:03 +02:00
parent 983034a561
commit 3aac4aa107
18 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Android.mk
View file

@ -25,9 +25,9 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)/src \
$(LOCAL_PATH)/$(LIBXML_PATH)/include
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
LOCAL_CFLAGS := -DCPU_arm -DARM_HAS_DIV -DARMV6T2 -DARMV6_ASSEMBLY -DANDROIDSDL -DAMIBERRY -D_REENTRANT
LOCAL_CFLAGS := -DCPU_arm -DARM_HAS_DIV -DARMV6T2 -DARMV6_ASSEMBLY -DAMIBERRY -D_REENTRANT
else ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
LOCAL_CFLAGS := -DCPU_AARCH64 -DANDROIDSDL -DAMIBERRY -D_REENTRANT
LOCAL_CFLAGS := -DCPU_AARCH64 -DAMIBERRY -D_REENTRANT
endif
LOCAL_CPPFLAGS := -std=gnu++14 -pipe -frename-registers \

2
src/caps/caps_amiberry.cpp
View file

@ -67,7 +67,7 @@ int caps_init (void)
if (init)
return 1;
#ifdef ANDROIDSDL
#ifdef ANDROID
UAE_DLHANDLE h = uae_dlopen_plugin(_T("libcapsimage.so"));
#else
UAE_DLHANDLE h = uae_dlopen_plugin(_T("capsimg"));

2
src/include/options.h
View file

@ -869,7 +869,7 @@ struct uae_prefs {
#endif
/* ANDROID */
#ifdef ANDROIDSDL
#ifdef ANDROID
int onScreen;
int onScreen_textinput;
int onScreen_dpad;

10
src/osdep/amiberry.cpp
View file

@ -405,7 +405,7 @@ void target_default_options(struct uae_prefs* p, int type)
p->use_retroarch_menu = true;
p->use_retroarch_reset = false;
#ifdef ANDROIDSDL
#ifdef ANDROID
p->onScreen = 1;
p->onScreen_textinput = 1;
p->onScreen_dpad = 1;
@ -476,7 +476,7 @@ void target_save_options(struct zfile* f, struct uae_prefs* p)
cfgfile_write_bool(f, _T("amiberry.use_retroarch_menu"), p->use_retroarch_menu);
cfgfile_write_bool(f, _T("amiberry.use_retroarch_reset"), p->use_retroarch_reset);
#ifdef ANDROIDSDL
#ifdef ANDROID
cfgfile_write(f, "amiberry.onscreen", "%d", p->onScreen);
cfgfile_write(f, "amiberry.onscreen_textinput", "%d", p->onScreen_textinput);
cfgfile_write(f, "amiberry.onscreen_dpad", "%d", p->onScreen_dpad);
@ -525,7 +525,7 @@ TCHAR *target_expand_environment(const TCHAR *path, TCHAR *out, int maxlen)
int target_parse_option(struct uae_prefs* p, const char* option, const char* value)
{
#ifdef ANDROIDSDL
#ifdef ANDROID
int result = (cfgfile_intval(option, value, "onscreen", &p->onScreen, 1)
|| cfgfile_intval(option, value, "onscreen_textinput", &p->onScreen_textinput, 1)
|| cfgfile_intval(option, value, "onscreen_dpad", &p->onScreen_dpad, 1)
@ -1340,7 +1340,7 @@ int handle_msgpump()
const auto mouseScale = currprefs.input_joymouse_multiplier / 2;
auto x = rEvent.motion.xrel;
auto y = rEvent.motion.yrel;
#if defined (ANDROIDSDL)
#if defined (ANDROID)
if (rEvent.motion.x == 0 && x > -4)
x = -4;
if (rEvent.motion.y == 0 && y > -4)
@ -1349,7 +1349,7 @@ int handle_msgpump()
x = 4;
if (rEvent.motion.y == currprefs.gfx_monitor.gfx_size.height - 1 && y < 4)
y = 4;
#endif //ANDROIDSDL
#endif //ANDROID
setmousestate(0, 0, x * mouseScale, 0);
setmousestate(0, 1, y * mouseScale, 0);
}

8
src/osdep/amiberry_gfx.cpp
View file

@ -19,7 +19,7 @@
#include "inputdevice.h"
#if 0
#ifdef ANDROIDSDL
#ifdef ANDROID
#include <SDL_screenkeyboard.h>
#endif
#endif
@ -42,7 +42,7 @@ SDL_Thread * renderthread = nullptr;
SDL_Renderer* renderer;
const char* sdl_video_driver;
#ifdef ANDROIDSDL
#ifdef ANDROID
#include <android/log.h>
#endif
@ -464,7 +464,7 @@ void graphics_subshutdown()
}
#if 0 // Disabled until we see how this is implemented in SDL2
#ifdef ANDROIDSDL
#ifdef ANDROID
void update_onscreen()
{
SDL_ANDROID_SetScreenKeyboardFloatingJoystick(changed_prefs.floatingJoystick);
@ -548,7 +548,7 @@ static void open_screen(struct uae_prefs* p)
}
#if 0
#ifdef ANDROIDSDL
#ifdef ANDROID
update_onscreen();
#endif
#endif

4
src/osdep/gui/CreateFilesysHardfile.cpp
View file

@ -17,7 +17,7 @@
#include "inputdevice.h"
#include "amiberry_gfx.h"
#ifdef ANDROIDSDL
#ifdef ANDROID
#include "androidsdl_event.h"
#endif
@ -311,7 +311,7 @@ static void CreateFilesysHardfileLoop()
//-------------------------------------------------
// Send event to gui-controls
//-------------------------------------------------
#ifdef ANDROIDSDL
#ifdef ANDROID
androidsdl_event(event, gui_input);
#else
gui_input->pushInput(event);

4
src/osdep/gui/EditFilesysHardfile.cpp
View file

@ -20,7 +20,7 @@
#include "inputdevice.h"
#include "amiberry_gfx.h"
#ifdef ANDROIDSDL
#ifdef ANDROID
#include "androidsdl_event.h"
#endif
@ -485,7 +485,7 @@ static void EditFilesysHardfileLoop()
//-------------------------------------------------
// Send event to guichan-controls
//-------------------------------------------------
#ifdef ANDROIDSDL
#ifdef ANDROID
androidsdl_event(event, gui_input);
#else
gui_input->pushInput(event);

4
src/osdep/gui/EditFilesysVirtual.cpp
View file

@ -18,7 +18,7 @@
#include "inputdevice.h"
#include "amiberry_gfx.h"
#ifdef ANDROIDSDL
#ifdef ANDROID
#include "androidsdl_event.h"
#endif
@ -314,7 +314,7 @@ static void EditFilesysVirtualLoop()
//-------------------------------------------------
// Send event to guichan-controls
//-------------------------------------------------
#ifdef ANDROIDSDL
#ifdef ANDROID
androidsdl_event(event, gui_input);
#else
gui_input->pushInput(event);

4
src/osdep/gui/InGameMessage.cpp
View file

@ -15,7 +15,7 @@
#include "amiberry_gfx.h"
#include "inputdevice.h"
#ifdef ANDROIDSDL
#ifdef ANDROID
#include "androidsdl_event.h"
#endif
@ -167,7 +167,7 @@ void message_checkInput()
//-------------------------------------------------
// Send event to gui-controls
//-------------------------------------------------
#ifdef ANDROIDSDL
#ifdef ANDROID
androidsdl_event(msg_event, msg_input);
#else
msg_input->pushInput(msg_event);

4
src/osdep/gui/Navigation.cpp
View file

@ -38,7 +38,7 @@ static NavigationMap navMap[] =
{ "Input", "cboPort0mode", "cboPort0", "Sound", "Custom controls" },
{ "Custom controls", "Right Trigger", "0: Mouse", "Input", "Miscellaneous" },
{ "Miscellaneous", "StatusLine", "StatusLine", "Custom controls", "Savestates" },
#ifdef ANDROIDSDL
#ifdef ANDROID
{ "Savestates", "State0", "State0", "Miscellaneous", "OnScreen" },
{ "OnScreen", "OnScrButton3", "OnScrCtrl", "Savestates", "Shutdown" },
{ "Quit", "Start", "Help", "OnScreen", "Paths" },
@ -299,7 +299,7 @@ static NavigationMap navMap[] =
{ "LoadState", "Savestates", "SaveState", "State3", "State0" },
{ "SaveState", "LoadState", "Savestates", "State3", "State0" },
#ifdef ANDROIDSDL
#ifdef ANDROID
// PanelOnScreen
{ "OnScrCtrl", "OnScreen", "OnScrButton3", "DisableMenuVKeyb", "OnScrTextInput" },
{ "OnScrButton3", "OnScrCtrl", "OnScreen", "CustomPos", "OnScrButton4" },

4
src/osdep/gui/PanelInput.cpp
View file

@ -12,7 +12,7 @@
#include "inputdevice.h"
#if 0
#ifdef ANDROIDSDL
#ifdef ANDROID
#include <SDL_android.h>
#endif
#endif
@ -241,7 +241,7 @@ public:
else if (actionEvent.getSource() == chkMouseHack)
{
#if 0
#ifdef ANDROIDSDL
#ifdef ANDROID
if (chkMouseHack->isSelected())
SDL_ANDROID_SetMouseEmulationMode(0, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1);
else

4
src/osdep/gui/SelectFile.cpp
View file

@ -22,7 +22,7 @@
#include "inputdevice.h"
#include "amiberry_gfx.h"
#ifdef ANDROIDSDL
#ifdef ANDROID
#include "androidsdl_event.h"
#endif
@ -431,7 +431,7 @@ static void SelectFileLoop()
//-------------------------------------------------
// Send event to guisan-controls
//-------------------------------------------------
#ifdef ANDROIDSDL
#ifdef ANDROID
androidsdl_event(event, gui_input);
#else
gui_input->pushInput(event);

4
src/osdep/gui/SelectFolder.cpp
View file

@ -20,7 +20,7 @@
#include "inputdevice.h"
#include "amiberry_gfx.h"
#ifdef ANDROIDSDL
#ifdef ANDROID
#include "androidsdl_event.h"
#endif
@ -335,7 +335,7 @@ static void SelectFolderLoop()
//-------------------------------------------------
// Send event to guisan-controls
//-------------------------------------------------
#ifdef ANDROIDSDL
#ifdef ANDROID
androidsdl_event(event, gui_input);
#else
gui_input->pushInput(event);

4
src/osdep/gui/ShowHelp.cpp
View file

@ -16,7 +16,7 @@
#include "inputdevice.h"
#include "amiberry_gfx.h"
#ifdef ANDROIDSDL
#ifdef ANDROID
#include "androidsdl_event.h"
#endif
@ -183,7 +183,7 @@ static void ShowHelpLoop(void)
//-------------------------------------------------
// Send event to guisan-controls
//-------------------------------------------------
#ifdef ANDROIDSDL
#ifdef ANDROID
androidsdl_event(event, gui_input);
#else
gui_input->pushInput(event);

4
src/osdep/gui/ShowMessage.cpp
View file

@ -12,7 +12,7 @@
#include "config.h"
#include "gui_handling.h"
#ifdef ANDROIDSDL
#ifdef ANDROID
#include "androidsdl_event.h"
#endif
@ -236,7 +236,7 @@ static void ShowMessageLoop()
//-------------------------------------------------
// Send event to guisan-controls
//-------------------------------------------------
#ifdef ANDROIDSDL
#ifdef ANDROID
androidsdl_event(event, gui_input);
#else
gui_input->pushInput(event);

2
src/osdep/gui/gui_handling.h
View file

@ -138,7 +138,7 @@ void ExitPanelSavestate(void);
void RefreshPanelSavestate(void);
bool HelpPanelSavestate(std::vector<std::string> &helptext);
#ifdef ANDROIDSDL
#ifdef ANDROID
void InitPanelOnScreen(const struct _ConfigCategory& category);
void ExitPanelOnScreen(void);
void RefreshPanelOnScreen(void);

14
src/osdep/gui/main_window.cpp
View file

@ -20,7 +20,7 @@
#include "inputdevice.h"
#if defined(ANDROIDSDL)
#if defined(ANDROID)
#include "androidsdl_event.h"
//#include <SDL_screenkeyboard.h>
//#include <SDL_android.h>
@ -60,7 +60,7 @@ ConfigCategory categories[] = {
{ "Custom controls", "data/controller.png", nullptr, nullptr, InitPanelCustom, ExitPanelCustom, RefreshPanelCustom, HelpPanelCustom },
{ "Miscellaneous", "data/misc.ico", nullptr, nullptr, InitPanelMisc, ExitPanelMisc, RefreshPanelMisc, HelpPanelMisc },
{ "Savestates", "data/savestate.png", nullptr, nullptr, InitPanelSavestate, ExitPanelSavestate, RefreshPanelSavestate, HelpPanelSavestate },
#ifdef ANDROIDSDL
#ifdef ANDROID
{ "OnScreen", "data/screen.ico", NULL, NULL, InitPanelOnScreen, ExitPanelOnScreen, RefreshPanelOnScreen, HelpPanelOnScreen },
#endif
{ nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr }
@ -84,7 +84,7 @@ enum
PANEL_CUSTOM,
PANEL_MISC,
PANEL_SAVESTATES,
#ifdef ANDROIDSDL
#ifdef ANDROID
PANEL_ONSCREEN,
#endif
NUM_PANELS
@ -732,7 +732,7 @@ void checkInput()
//-------------------------------------------------
// Send event to gui-controls
//-------------------------------------------------
#ifdef ANDROIDSDL
#ifdef ANDROID
androidsdl_event(gui_event, gui_input);
#else
gui_input->pushInput(gui_event);
@ -1017,7 +1017,7 @@ void gui_widgets_init()
//--------------------------------------------------
// Place everything on main form
//--------------------------------------------------
#ifndef ANDROIDSDL
#ifndef ANDROID
gui_top->add(cmdShutdown, DISTANCE_BORDER, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
#endif
gui_top->add(cmdQuit, DISTANCE_BORDER + BUTTON_WIDTH + DISTANCE_NEXT_X, GUI_HEIGHT - DISTANCE_BORDER - BUTTON_HEIGHT);
@ -1095,7 +1095,7 @@ void DisableResume()
void run_gui()
{
#if 0
#ifdef ANDROIDSDL
#ifdef ANDROID
SDL_ANDROID_SetScreenKeyboardShown(0);
SDL_ANDROID_SetSystemMousePointerVisible(1);
#endif
@ -1120,7 +1120,7 @@ void run_gui()
gui_widgets_halt();
amiberry_gui_halt();
#if 0
#ifdef ANDROIDSDL
#ifdef ANDROID
if (currprefs.onScreen != 0)
{
SDL_ANDROID_SetScreenKeyboardShown(1);

2
src/sounddep/sound.cpp
View file

@ -15,7 +15,7 @@
#include "sounddep/sound.h"
#include "gui.h"
#ifdef ANDROIDSDL
#ifdef ANDROID
#include <android/log.h>
#endif