From 9cb18232c290c1876cdb6570ef11f29fa7a98ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Thu, 20 Dec 2018 10:41:39 +0100 Subject: Core: Drop unused global_defaults logic It used to be used for Android and iOS to specify platform-specific project settings overrides, but we now have feature tags for that. --- core/SCsub | 16 ---------------- core/project_settings.h | 2 -- 2 files changed, 18 deletions(-) (limited to 'core') 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); -- cgit v1.2.3