diff options
| author | Andrei Karas <akaras@inbox.ru> | 2020-05-18 06:16:56 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2020-05-18 09:29:03 +0300 |
| commit | 38fde36893d90ee061eba223702bc625ea30803d (patch) | |
| tree | 84a581d002cac13cdc466dc23f9497f38e4cea3e | |
| parent | f8a9cbf78a0ae2f1d571f773275cd6493fb1a4ea (diff) | |
| download | mv-38fde36893d90ee061eba223702bc625ea30803d.tar.gz mv-38fde36893d90ee061eba223702bc625ea30803d.tar.bz2 mv-38fde36893d90ee061eba223702bc625ea30803d.tar.xz mv-38fde36893d90ee061eba223702bc625ea30803d.zip | |
Fix compilation error after switch port merged
| -rw-r--r-- | src/input/inputactionmap.h | 8 | ||||
| -rwxr-xr-x | tools/ci/flags/gcc10.sh | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 926a98e6b..656cd430d 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -388,9 +388,9 @@ static const InputActionData inputActionData addKey(SDLK_AC_BACK), #elif defined(__SWITCH__) joystickButton(11), -#else +#endif // defined(ANDROID) +#else // defined(USE_SDL2) emptyKey, -#endif #endif // defined(USE_SDL2) Input::GRP_DEFAULT, &Actions::quit, @@ -2824,9 +2824,9 @@ static const InputActionData inputActionData addKey(SDLK_AC_BACK), #elif defined(__SWITCH__) joystickButton(11), -#else +#endif // defined(ANDROID) +#else // defined(USE_SDL2) emptyKey, -#endif #endif // defined(USE_SDL2) Input::GRP_GUICHAN, nullptr, diff --git a/tools/ci/flags/gcc10.sh b/tools/ci/flags/gcc10.sh index f85c044f1..61caac388 100755 --- a/tools/ci/flags/gcc10.sh +++ b/tools/ci/flags/gcc10.sh @@ -28,6 +28,7 @@ export CXXFLAGS="${CXXFLAGS} -Walloca" # not for C++ #export CXXFLAGS="${CXXFLAGS} -Wampersand" #export CXXFLAGS="${CXXFLAGS} -Wargument-mismatch" +export CXXFLAGS="${CXXFLAGS} -Warith-conversion" export CXXFLAGS="${CXXFLAGS} -Warray-bounds" # +++ need try it export CXXFLAGS="${CXXFLAGS} -Warray-bounds=2" |