diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-11 18:13:45 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-12 09:52:22 +0200 |
| commit | 277b24dfb7acdb42589b931252bbe7be81c7536e (patch) | |
| tree | 248dc6dfca0e27c3b03533b45753a16d186d2811 /core/SCsub | |
| parent | cc71012266f880dcf3b37e40d5f90d9ce8b7a432 (diff) | |
Make core/ includes absolute, remove subfolders from include path
This allows more consistency in the manner we include core headers,
where previously there would be a mix of absolute, relative and
include path-dependent includes.
Diffstat (limited to 'core/SCsub')
| -rw-r--r-- | core/SCsub | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/SCsub b/core/SCsub index c8e2e10b9f..a6365bf925 100644 --- a/core/SCsub +++ b/core/SCsub @@ -18,7 +18,7 @@ for x in env.global_defaults: gd_inc += '#include "platform/' + x + '/globals/global_defaults.h"\n' gd_call += "\tregister_" + x + "_global_defaults();\n" -gd_cpp = '#include "project_settings.h"\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" @@ -52,7 +52,7 @@ if ("SCRIPT_AES256_ENCRYPTION_KEY" in os.environ): # NOTE: It is safe to generate this file here, since this is still executed serially with open("script_encryption_key.gen.cpp", "w") as f: - f.write("#include \"project_settings.h\"\nuint8_t script_encryption_key[32]={" + txt + "};\n") + f.write("#include \"core/project_settings.h\"\nuint8_t script_encryption_key[32]={" + txt + "};\n") # Add required thirdparty code. Header paths are hardcoded, we don't need to append |