diff options
| author | cpasjuste <cpasjuste@gmail.com> | 2020-04-22 23:36:38 +0200 |
|---|---|---|
| committer | cpasjuste <cpasjuste@gmail.com> | 2020-04-22 23:36:38 +0200 |
| commit | 94162704b6ffe557b65d70faa4b82e082039f75e (patch) | |
| tree | c960b6a357473541f38cefa8fd1b3d610aa569f1 | |
| parent | eeb40fb079971ece6288e5210e42a9cc3fc95790 (diff) | |
| download | manaverse-94162704b6ffe557b65d70faa4b82e082039f75e.tar.gz manaverse-94162704b6ffe557b65d70faa4b82e082039f75e.tar.bz2 manaverse-94162704b6ffe557b65d70faa4b82e082039f75e.tar.xz manaverse-94162704b6ffe557b65d70faa4b82e082039f75e.zip | |
switch: enable sdl2 keyboard
| -rw-r--r-- | src/maingui.cpp | 6 | ||||
| -rw-r--r-- | src/progs/manaplus/actions/actions.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/maingui.cpp b/src/maingui.cpp index 054db6b05..be25ded1d 100644 --- a/src/maingui.cpp +++ b/src/maingui.cpp @@ -97,7 +97,7 @@ PRAGMA48(GCC diagnostic pop) #include "debug.h" -#ifdef __SWITCH__ +#if defined(__SWITCH__) && !defined(NDEBUG) extern "C" { #include <switch/runtime/devices/socket.h> #include <switch/runtime/nxlink.h> @@ -130,7 +130,7 @@ int main(int argc, char *argv[]) int mainGui(int argc, char *argv[]) #endif // ANDROID { -#ifdef __SWITCH__ +#if defined(__SWITCH__) && !defined(NDEBUG) initNxLink(); #endif #if defined(__MINGW32__) @@ -185,7 +185,7 @@ int mainGui(int argc, char *argv[]) IMG_Quit(); #endif // SDL_IMAGE_VERSION_ATLEAST(1, 2, 11) -#ifdef __SWITCH__ +#if defined(__SWITCH__) && !defined(NDEBUG) deinitNxLink(); #endif diff --git a/src/progs/manaplus/actions/actions.cpp b/src/progs/manaplus/actions/actions.cpp index 4606137f3..3a48e5a33 100644 --- a/src/progs/manaplus/actions/actions.cpp +++ b/src/progs/manaplus/actions/actions.cpp @@ -995,7 +995,7 @@ impHandler0(stopSit) impHandler0(showKeyboard) { -#ifdef ANDROID +#if defined(ANDROID) || defined(__SWITCH__) #ifdef USE_SDL2 if (SDL_GetEventState(SDL_TEXTINPUT) == SDL_ENABLE) SDL_StopTextInput(); |