diff options
| author | Andrei Karas <akaras@inbox.ru> | 2020-05-18 06:18:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2020-05-18 09:29:03 +0300 |
| commit | 2e346040fe46806bc86ca40d418f4769c0d8ea50 (patch) | |
| tree | f75b4b6fe1b8db94ae093d0341daafa5f713ea1b | |
| parent | 38fde36893d90ee061eba223702bc625ea30803d (diff) | |
| download | manaplus-2e346040fe46806bc86ca40d418f4769c0d8ea50.tar.gz manaplus-2e346040fe46806bc86ca40d418f4769c0d8ea50.tar.bz2 manaplus-2e346040fe46806bc86ca40d418f4769c0d8ea50.tar.xz manaplus-2e346040fe46806bc86ca40d418f4769c0d8ea50.zip | |
Add new flags into gc110 flags
| -rw-r--r-- | src/input/inputactionmap.h | 4 | ||||
| -rwxr-xr-x | tools/ci/flags/gcc10.sh | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/input/inputactionmap.h b/src/input/inputactionmap.h index 656cd430d..318f70db1 100644 --- a/src/input/inputactionmap.h +++ b/src/input/inputactionmap.h @@ -388,6 +388,8 @@ static const InputActionData inputActionData addKey(SDLK_AC_BACK), #elif defined(__SWITCH__) joystickButton(11), +#else // defined(ANDROID) + emptyKey, #endif // defined(ANDROID) #else // defined(USE_SDL2) emptyKey, @@ -2824,6 +2826,8 @@ static const InputActionData inputActionData addKey(SDLK_AC_BACK), #elif defined(__SWITCH__) joystickButton(11), +#else // defined(ANDROID) + emptyKey, #endif // defined(ANDROID) #else // defined(USE_SDL2) emptyKey, diff --git a/tools/ci/flags/gcc10.sh b/tools/ci/flags/gcc10.sh index 61caac388..d83ecd4ec 100755 --- a/tools/ci/flags/gcc10.sh +++ b/tools/ci/flags/gcc10.sh @@ -49,7 +49,8 @@ export CXXFLAGS="${CXXFLAGS} -Wbuiltin-macro-redefined" #export CXXFLAGS="${CXXFLAGS} -Wc++11-compat" #export CXXFLAGS="${CXXFLAGS} -Wc++14-compat" #export CXXFLAGS="${CXXFLAGS} -Wc++17-compat" -export CXXFLAGS="${CXXFLAGS} -Wc++1z-compat" +#export CXXFLAGS="${CXXFLAGS} -Wc++1z-compat" +export CXXFLAGS="${CXXFLAGS} -Wc++2a-compat" # not for C++ #export CXXFLAGS="${CXXFLAGS} -Wc-binding-type" #export CXXFLAGS="${CXXFLAGS} -Wc90-c99-compat" @@ -241,6 +242,7 @@ export CXXFLAGS="${CXXFLAGS} -Woverloaded-virtual" # not for C++ #export CXXFLAGS="${CXXFLAGS} -Woverride-init" #export CXXFLAGS="${CXXFLAGS} -Woverride-init-side-effects" +#export CXXFLAGS="${CXXFLAGS} -Woverwrite-recursive" export CXXFLAGS="${CXXFLAGS} -Wpacked" export CXXFLAGS="${CXXFLAGS} -Wpacked-bitfield-compat" export CXXFLAGS="${CXXFLAGS} -Wpacked-not-aligned" |