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/webm | |
| 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/webm')
| -rw-r--r-- | modules/webm/SCsub | 10 | ||||
| -rw-r--r-- | modules/webm/libvpx/SCsub | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/modules/webm/SCsub b/modules/webm/SCsub index dcc9a45044..e57437229f 100644 --- a/modules/webm/SCsub +++ b/modules/webm/SCsub @@ -15,7 +15,7 @@ thirdparty_sources = [ ] thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] -env_webm.Append(CPPPATH=[thirdparty_dir, thirdparty_dir + "libwebm/"]) +env_webm.Prepend(CPPPATH=[thirdparty_dir, thirdparty_dir + "libwebm/"]) # upstream uses c++11 if (not env_webm.msvc): @@ -23,14 +23,14 @@ if (not env_webm.msvc): # also requires libogg, libvorbis and libopus if env['builtin_libogg']: - env_webm.Append(CPPPATH=["#thirdparty/libogg"]) + env_webm.Prepend(CPPPATH=["#thirdparty/libogg"]) if env['builtin_libvorbis']: - env_webm.Append(CPPPATH=["#thirdparty/libvorbis"]) + env_webm.Prepend(CPPPATH=["#thirdparty/libvorbis"]) if env['builtin_opus']: - env_webm.Append(CPPPATH=["#thirdparty/opus"]) + env_webm.Prepend(CPPPATH=["#thirdparty/opus"]) if env['builtin_libvpx']: - env_webm.Append(CPPPATH=["#thirdparty/libvpx"]) + env_webm.Prepend(CPPPATH=["#thirdparty/libvpx"]) SConscript("libvpx/SCsub") env_thirdparty = env_webm.Clone() diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index 5bf4ea3464..a6be1380a6 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -256,7 +256,7 @@ libvpx_sources_arm_neon_gas_apple = [libvpx_dir + file for file in libvpx_source env_libvpx = env_modules.Clone() env_libvpx.disable_warnings() -env_libvpx.Append(CPPPATH=[libvpx_dir]) +env_libvpx.Prepend(CPPPATH=[libvpx_dir]) webm_multithread = env["platform"] != 'javascript' @@ -380,7 +380,7 @@ if webm_cpu_x86: elif webm_cpu_arm: env_libvpx.add_source_files(env.modules_sources, libvpx_sources_arm) if env["platform"] == 'android': - env_libvpx.Append(CPPPATH=[libvpx_dir + "third_party/android"]) + env_libvpx.Prepend(CPPPATH=[libvpx_dir + "third_party/android"]) env_libvpx.add_source_files(env.modules_sources, [libvpx_dir + "third_party/android/cpu-features.c"]) env_libvpx_neon = env_libvpx.Clone() |