From cb59236ce938fdf3ffe20b1f77c4f7058ddaadf1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Fri, 30 Jun 2017 18:14:59 +0200 Subject: Disable etc2comp and tinyexr modules on non-tools build They are not necessary in such configuration, and require C++11 and (on Android) the STL. Fixes #9273. --- modules/etc/config.py | 6 +++++- modules/tinyexr/config.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/etc/config.py b/modules/etc/config.py index fb920482f5..4b0b01b78e 100644 --- a/modules/etc/config.py +++ b/modules/etc/config.py @@ -4,4 +4,8 @@ def can_build(platform): def configure(env): - pass + # Tools only, disabled for non-tools + # TODO: Find a cleaner way to achieve that + if (env["tools"] == "no"): + env["module_etc_enabled"] = "no" + env.disabled_modules.append("etc") diff --git a/modules/tinyexr/config.py b/modules/tinyexr/config.py index fb920482f5..2e4b96a6b0 100644 --- a/modules/tinyexr/config.py +++ b/modules/tinyexr/config.py @@ -4,4 +4,8 @@ def can_build(platform): def configure(env): - pass + # Tools only, disabled for non-tools + # TODO: Find a cleaner way to achieve that + if (env["tools"] == "no"): + env["module_tinyexr_enabled"] = "no" + env.disabled_modules.append("tinyexr") -- cgit v1.2.3