diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-30 18:23:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-04-30 18:23:38 +0200 |
| commit | a7f00f3bacbb41f35b7120db6a911eda7c6feac9 (patch) | |
| tree | 2d786b3d7fddbbb869ffdc33fa29279e179ae07f /modules/gdnative | |
| parent | a5c619dc8dc8a488599c3b08314ddb69e0ed445e (diff) | |
| parent | d52b70fb5e8e842ddcc9a57bad8e34366c0ee6d8 (diff) | |
Merge pull request #28530 from akien-mga/scons-prepend-cpppath
SCons: Always use env.Prepend for CPPPATH
Diffstat (limited to 'modules/gdnative')
| -rw-r--r-- | modules/gdnative/SCsub | 4 | ||||
| -rw-r--r-- | modules/gdnative/videodecoder/SCsub | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/modules/gdnative/SCsub b/modules/gdnative/SCsub index 235f0b97bb..0cdd585558 100644 --- a/modules/gdnative/SCsub +++ b/modules/gdnative/SCsub @@ -12,7 +12,7 @@ env_gdnative.add_source_files(env.modules_sources, "nativescript/*.cpp") env_gdnative.add_source_files(env.modules_sources, "gdnative_library_singleton_editor.cpp") env_gdnative.add_source_files(env.modules_sources, "gdnative_library_editor_plugin.cpp") -env_gdnative.Append(CPPPATH=['#modules/gdnative/include/']) +env_gdnative.Prepend(CPPPATH=['#modules/gdnative/include/']) Export('env_gdnative') @@ -36,7 +36,7 @@ if ARGUMENTS.get('gdnative_wrapper', False): gensource, = env_gdnative.CommandNoCache('gdnative_wrapper_code.gen.cpp', 'gdnative_api.json', run_in_subprocess(gdnative_builders.build_gdnative_wrapper_code)) gd_wrapper_env = env.Clone() - gd_wrapper_env.Append(CPPPATH=['#modules/gdnative/include/']) + gd_wrapper_env.Prepend(CPPPATH=['#modules/gdnative/include/']) if gd_wrapper_env['use_lto']: if not env.msvc: diff --git a/modules/gdnative/videodecoder/SCsub b/modules/gdnative/videodecoder/SCsub index 8d9c1ff50e..04cc8ed604 100644 --- a/modules/gdnative/videodecoder/SCsub +++ b/modules/gdnative/videodecoder/SCsub @@ -5,5 +5,5 @@ Import('env_modules') env_vsdecoder_gdnative = env_modules.Clone() -env_vsdecoder_gdnative.Append(CPPPATH=['#modules/gdnative/include/']) +env_vsdecoder_gdnative.Prepend(CPPPATH=['#modules/gdnative/include/']) env_vsdecoder_gdnative.add_source_files(env.modules_sources, '*.cpp') |