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/websocket/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/websocket/SCsub')
| -rw-r--r-- | modules/websocket/SCsub | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/websocket/SCsub b/modules/websocket/SCsub index 12b4969cf7..2d2de81220 100644 --- a/modules/websocket/SCsub +++ b/modules/websocket/SCsub @@ -75,7 +75,7 @@ if env['builtin_libwebsockets'] and not env["platform"] == "javascript": # alrea else: # Unix socket thirdparty_sources += Glob(thirdparty_dir + "lib/plat/unix/*.c") - env_lws.Append(CPPPATH=[thirdparty_dir + 'include/']) + env_lws.Prepend(CPPPATH=[thirdparty_dir + 'include/']) if env['builtin_mbedtls']: mbedtls_includes = "#thirdparty/mbedtls/include" @@ -85,14 +85,14 @@ if env['builtin_libwebsockets'] and not env["platform"] == "javascript": # alrea env_lws.Prepend(CPPPATH=wrapper_includes) if env["platform"] == "windows" or env["platform"] == "uwp": - env_lws.Append(CPPPATH=[helper_dir]) + env_lws.Prepend(CPPPATH=[helper_dir]) if env["platform"] == "uwp": env_lws.Append(CPPFLAGS=["/DLWS_MINGW_SUPPORT"]) env_thirdparty = env_lws.Clone() env_thirdparty.disable_warnings() - env_thirdparty.Append(CPPPATH=[thirdparty_dir + 'lib/']) + env_thirdparty.Prepend(CPPPATH=[thirdparty_dir + 'lib/']) env_thirdparty.add_source_files(env.modules_sources, thirdparty_sources) env_lws.add_source_files(env.modules_sources, "*.cpp") |