summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
Diffstat (limited to 'platform')
-rw-r--r--platform/javascript/detect.py3
-rw-r--r--platform/x11/detect.py3
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.)