summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <rverschelde@gmail.com>2020-01-08 14:55:21 +0100
committerGitHub <noreply@github.com>2020-01-08 14:55:21 +0100
commit29e6f60d9bc4e7c5b872ddb25df6d779ba833347 (patch)
tree54fc6817ae75e4833b423a75e88ca0aff096a8c7 /main
parentb942f488b287016e53aa286bf93939d17138f50f (diff)
parent0749906d8ab18f1150699d0d0f7df4e71f4e47f8 (diff)
Merge pull request #34910 from akien-mga/gamepad-fix-controllerdbs-order
Gamepad: Fix parsing order for SDL2 controller databases
Diffstat (limited to 'main')
-rw-r--r--main/SCsub4
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))