From d5aae18363bcd9867d27d8db5bdcf1d8579bb42c Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Thu, 14 Jun 2018 19:53:30 +0200 Subject: [PATCH] removed SDL 2.0 key symbols (using preprocessor) when compiling for SDL 1.2 --- src/screens.c | 10 ++++++++-- src/tools.c | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/screens.c b/src/screens.c index ad21972c..1291b8ea 100644 --- a/src/screens.c +++ b/src/screens.c @@ -7558,13 +7558,19 @@ boolean ConfigureVirtualButtonsMain() /* press 'Enter' to keep the existing key binding */ if (key == KSYM_Return || +#if defined(TARGET_SDL2) key == KSYM_Menu || +#endif key == KSYM_space) { step_nr++; } - else if (key == KSYM_BackSpace || - key == KSYM_Back) + else if (key == KSYM_BackSpace +#if defined(TARGET_SDL2) + || + key == KSYM_Back +#endif + ) { if (step_nr == 0) { diff --git a/src/tools.c b/src/tools.c index 6d3a0aeb..9e06ab4a 100644 --- a/src/tools.c +++ b/src/tools.c @@ -4186,8 +4186,8 @@ static int RequestHandleEvents(unsigned int req_state) case KSYM_Return: case KSYM_y: - case KSYM_Y: #if defined(TARGET_SDL2) + case KSYM_Y: case KSYM_Select: case KSYM_Menu: #if defined(KSYM_Rewind) @@ -4199,8 +4199,8 @@ static int RequestHandleEvents(unsigned int req_state) case KSYM_Escape: case KSYM_n: - case KSYM_N: #if defined(TARGET_SDL2) + case KSYM_N: case KSYM_Back: #if defined(KSYM_FastForward) case KSYM_FastForward: /* for Amazon Fire TV remote */ -- 2.34.1