From d52b70fb5e8e842ddcc9a57bad8e34366c0ee6d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Tue, 30 Apr 2019 13:12:02 +0200 Subject: 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). --- modules/opus/SCsub | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'modules/opus/SCsub') diff --git a/modules/opus/SCsub b/modules/opus/SCsub index a1325734e2..f3c981dd45 100644 --- a/modules/opus/SCsub +++ b/modules/opus/SCsub @@ -206,7 +206,7 @@ if env['builtin_opus']: # also requires libogg if env['builtin_libogg']: - env_opus.Append(CPPPATH=["#thirdparty/libogg"]) + env_opus.Prepend(CPPPATH=["#thirdparty/libogg"]) env_opus.Append(CPPFLAGS=["-DHAVE_CONFIG_H"]) @@ -218,7 +218,7 @@ if env['builtin_opus']: "silk/fixed", "silk/float", ] - env_opus.Append(CPPPATH=[thirdparty_dir + "/" + dir for dir in thirdparty_include_paths]) + env_opus.Prepend(CPPPATH=[thirdparty_dir + "/" + dir for dir in thirdparty_include_paths]) if env["platform"] == "android": if ("android_arch" in env and env["android_arch"] in ["armv6", "armv7"]): -- cgit v1.2.3