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 /core | |
| 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 'core')
| -rw-r--r-- | core/SCsub | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/SCsub b/core/SCsub index d5be74a64f..06efc8408d 100644 --- a/core/SCsub +++ b/core/SCsub @@ -80,9 +80,9 @@ if env['builtin_zlib']: ] thirdparty_zlib_sources = [thirdparty_zlib_dir + file for file in thirdparty_zlib_sources] - env_thirdparty.Append(CPPPATH=[thirdparty_zlib_dir]) + env_thirdparty.Prepend(CPPPATH=[thirdparty_zlib_dir]) # Needs to be available in main env too - env.Append(CPPPATH=[thirdparty_zlib_dir]) + env.Prepend(CPPPATH=[thirdparty_zlib_dir]) env_thirdparty.add_source_files(env.core_sources, thirdparty_zlib_sources) @@ -128,9 +128,9 @@ if env['builtin_zstd']: ] thirdparty_zstd_sources = [thirdparty_zstd_dir + file for file in thirdparty_zstd_sources] - env_thirdparty.Append(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"]) + env_thirdparty.Prepend(CPPPATH=[thirdparty_zstd_dir, thirdparty_zstd_dir + "common"]) env_thirdparty.Append(CPPFLAGS="-DZSTD_STATIC_LINKING_ONLY") - env.Append(CPPPATH=thirdparty_zstd_dir) + env.Prepend(CPPPATH=thirdparty_zstd_dir) # Also needed in main env includes will trigger warnings env.Append(CPPFLAGS="-DZSTD_STATIC_LINKING_ONLY") |