diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-08 12:23:37 +0100 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2020-01-08 12:26:53 +0100 |
| commit | 0749906d8ab18f1150699d0d0f7df4e71f4e47f8 (patch) | |
| tree | 3eceeeb56be4e5651dd5015af5eb2d7d378690bf | |
| parent | ae21664655a16526b1a8e3e30f4e03d9a7c9c67c (diff) | |
Gamepad: Fix parsing order for SDL2 controller databases
We were overriding values from `gamecontrollerdb.txt` (current, updated
upstream) with `gamecontrollerdb_205.txt` (legacy, SDL 2.0.5) and then
`gamecontrollerdb_204.txt` (legacy, SDL 2.0.4).
There was a comment to warn about this but it seems it did not prevent
using the wrong order for all this time...
Now `gamecontrollerdb.txt` mappings will properly override outdated
ones present in the `204` and `205` variants.
| -rw-r--r-- | main/SCsub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/main/SCsub b/main/SCsub index 73cec1d250..e1efc7e6ed 100644 --- a/main/SCsub +++ b/main/SCsub @@ -9,8 +9,8 @@ env.main_sources = [] env.add_source_files(env.main_sources, "*.cpp") -# order matters here. higher index controller database files write on top of lower index database files -controller_databases = ["#main/gamecontrollerdb.txt", "#main/gamecontrollerdb_205.txt", "#main/gamecontrollerdb_204.txt", "#main/godotcontrollerdb.txt"] +# Order matters here. Higher index controller database files write on top of lower index database files. +controller_databases = ["#main/gamecontrollerdb_204.txt", "#main/gamecontrollerdb_205.txt", "#main/gamecontrollerdb.txt", "#main/godotcontrollerdb.txt"] env.Depends("#main/default_controller_mappings.gen.cpp", controller_databases) env.CommandNoCache("#main/default_controller_mappings.gen.cpp", controller_databases, run_in_subprocess(main_builders.make_default_controller_mappings)) |