diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-30 13:12:02 +0200 |
---|---|---|
committer | Rémi Verschelde <rverschelde@gmail.com> | 2019-04-30 13:12:06 +0200 |
commit | d52b70fb5e8e842ddcc9a57bad8e34366c0ee6d8 (patch) | |
tree | a6c12125403b60a1620066e225061535fb362e4c /modules/theora/SCsub | |
parent | e949d6c2ae64a0faecd595b7589c1690426f18a7 (diff) |
SCons: Always use env.Prepend for CPPPATH
Include paths are processed from left to right, so we use Prepend to
ensure that paths to bundled thirdparty files will have precedence over
system paths (e.g. `/usr/include` should have lowest priority).
Diffstat (limited to 'modules/theora/SCsub')
-rw-r--r-- | modules/theora/SCsub | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/theora/SCsub b/modules/theora/SCsub index f98db2359c..785eca4c41 100644 --- a/modules/theora/SCsub +++ b/modules/theora/SCsub @@ -70,13 +70,13 @@ if env['builtin_libtheora']: thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] - env_theora.Append(CPPPATH=[thirdparty_dir]) + env_theora.Prepend(CPPPATH=[thirdparty_dir]) # also requires libogg and libvorbis if env['builtin_libogg']: - env_theora.Append(CPPPATH=["#thirdparty/libogg"]) + env_theora.Prepend(CPPPATH=["#thirdparty/libogg"]) if env['builtin_libvorbis']: - env_theora.Append(CPPPATH=["#thirdparty/libvorbis"]) + env_theora.Prepend(CPPPATH=["#thirdparty/libvorbis"]) env_thirdparty = env_theora.Clone() env_thirdparty.disable_warnings() |