diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-28 14:45:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-28 14:45:27 +0200 |
| commit | d8af4f9e02277194ca1bb053447a25bfed2b6524 (patch) | |
| tree | c33aa8ccee82b26d868fbc91abed94e2480864c2 /modules/webm/libvpx/SCsub | |
| parent | 243bdc4524ddcf8ac6bef03c378e14fe7bb263b8 (diff) | |
| parent | 3a2ca68af3c8bafe9f60f09bd8fece894fe3a925 (diff) | |
Merge pull request #22506 from akien-mga/thirdparty-no-warnings
SCons: Build thirdparty code in own env, disable warnings
Diffstat (limited to 'modules/webm/libvpx/SCsub')
| -rw-r--r-- | modules/webm/libvpx/SCsub | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/modules/webm/libvpx/SCsub b/modules/webm/libvpx/SCsub index 711000bd9f..98e38b9027 100644 --- a/modules/webm/libvpx/SCsub +++ b/modules/webm/libvpx/SCsub @@ -1,5 +1,10 @@ #!/usr/bin/env python +Import('env') +Import('env_modules') + +# Thirdparty sources + libvpx_dir = "#thirdparty/libvpx/" libvpx_sources = [ @@ -249,12 +254,8 @@ libvpx_sources_arm_neon_armasm_ms = [libvpx_dir + file for file in libvpx_source libvpx_sources_arm_neon_gas_apple = [libvpx_dir + file for file in libvpx_sources_arm_neon_gas_apple] -Import('env') -Import('env_webm') - -env_webm.Append(CPPPATH=[libvpx_dir]) - -env_libvpx = env.Clone() +env_libvpx = env_modules.Clone() +env_libvpx.disable_warnings() env_libvpx.Append(CPPPATH=[libvpx_dir]) webm_multithread = env["platform"] != 'javascript' |