diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-13 21:48:06 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-15 12:01:28 +0200 |
| commit | 8311a78df5cdf257297c1ec7493cb098dc76f010 (patch) | |
| tree | b8d84615a8b5429516f18253e0b3e201869bf53a /platform | |
| parent | 8981ff8a84e8cc6967afe3a11613e7d72d8ac599 (diff) | |
squish: Move to a module and split thirdparty lib
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/javascript/detect.py | 3 | ||||
| -rw-r--r-- | platform/x11/detect.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index fce57acc3b..19427eff14 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -26,8 +26,7 @@ def get_flags(): return [ ('tools', 'no'), - ('squish', 'no'), - ('etc1', 'no'), + ('module_etc1_enabled', 'no'), ('module_mpc_enabled', 'no'), ('module_theora_enabled', 'no'), ] diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 7c22bd97ff..90122eef4a 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -154,6 +154,9 @@ def configure(env): if (env["enet"] == "system"): env.ParseConfig('pkg-config libenet --cflags --libs') + if (env["squish"] == "system" and env["tools"] == "yes"): + env.ParseConfig('pkg-config libsquish --cflags --libs') + # Sound and video libraries # Keep the order as it triggers chained dependencies (ogg needed by others, etc.) |