diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-10-15 23:59:12 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 23:59:12 +0200 |
| commit | 96410f55b24e47af045e3ad31545331ce124d999 (patch) | |
| tree | 1fb750112b184249fe7018c4fb010efb701f92fb /core | |
| parent | c96dcdf50a49fc695d3cae5b3e48c0b67110146e (diff) | |
| parent | c13348053129d4a356a0df1ada208809997799fe (diff) | |
Merge pull request #53860 from akien-mga/scons-end-gen-cpp-suffering
Diffstat (limited to 'core')
| -rw-r--r-- | core/SCsub | 1 | ||||
| -rw-r--r-- | core/input/SCsub | 14 |
2 files changed, 6 insertions, 9 deletions
diff --git a/core/SCsub b/core/SCsub index 14dfa3487f..c12dd4e60e 100644 --- a/core/SCsub +++ b/core/SCsub @@ -146,6 +146,7 @@ env.core_sources += thirdparty_obj # Godot source files env.add_source_files(env.core_sources, "*.cpp") +env.add_source_files(env.core_sources, "script_encryption_key.gen.cpp") # Certificates env.Depends( diff --git a/core/input/SCsub b/core/input/SCsub index 740398b266..b12bf561de 100644 --- a/core/input/SCsub +++ b/core/input/SCsub @@ -7,19 +7,15 @@ import input_builders # Order matters here. Higher index controller database files write on top of lower index database files. controller_databases = [ - "#core/input/gamecontrollerdb.txt", - "#core/input/godotcontrollerdb.txt", + "gamecontrollerdb.txt", + "godotcontrollerdb.txt", ] -env.Depends("#core/input/default_controller_mappings.gen.cpp", controller_databases) -env.CommandNoCache( - "#core/input/default_controller_mappings.gen.cpp", +gensource = env.CommandNoCache( + "default_controller_mappings.gen.cpp", controller_databases, env.Run(input_builders.make_default_controller_mappings, "Generating default controller mappings."), ) env.add_source_files(env.core_sources, "*.cpp") - -# Don't warn about duplicate entry here, we need it registered manually for first build, -# even if later builds will pick it up twice due to above *.cpp globbing. -env.add_source_files(env.core_sources, "#core/input/default_controller_mappings.gen.cpp", warn_duplicates=False) +env.add_source_files(env.core_sources, gensource) |