diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-12-20 11:49:32 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-20 11:49:32 +0100 |
| commit | d8067e905c031df9abe475c966fe389b03036036 (patch) | |
| tree | 0f4e81ec019be3d7b8759f707d59b3457adf849a /core | |
| parent | a8faa5504279f867adb6f50f768d3cf00594dc4f (diff) | |
| parent | 9cb18232c290c1876cdb6570ef11f29fa7a98ce3 (diff) | |
Merge pull request #24500 from akien-mga/drop-global_defaults
Core: Drop unused global_defaults logic
Diffstat (limited to 'core')
| -rw-r--r-- | core/SCsub | 16 | ||||
| -rw-r--r-- | core/project_settings.h | 2 |
2 files changed, 0 insertions, 18 deletions
diff --git a/core/SCsub b/core/SCsub index c6d0b7e5b1..fe379d6936 100644 --- a/core/SCsub +++ b/core/SCsub @@ -8,22 +8,6 @@ from platform_methods import run_in_subprocess env.core_sources = [] -# Generate global defaults -gd_call = "" -gd_inc = "" - -for x in env.global_defaults: - env.core_sources.append("#platform/" + x + "/globals/global_defaults.cpp") - gd_inc += '#include "platform/' + x + '/globals/global_defaults.h"\n' - gd_call += "\tregister_" + x + "_global_defaults();\n" - -gd_cpp = '#include "core/project_settings.h"\n' -gd_cpp += gd_inc -gd_cpp += "void ProjectSettings::register_global_defaults() {\n" + gd_call + "\n}\n" - -with open("global_defaults.gen.cpp", "w") as f: - f.write(gd_cpp) - # Generate AES256 script encryption key import os diff --git a/core/project_settings.h b/core/project_settings.h index f150e4499b..c790669048 100644 --- a/core/project_settings.h +++ b/core/project_settings.h @@ -152,8 +152,6 @@ public: void set_disable_feature_overrides(bool p_disable); - void register_global_defaults(); - bool is_using_datapack() const; void set_registering_order(bool p_enable); |