diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2017-06-30 18:14:59 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2017-06-30 18:16:38 +0200 |
| commit | cb59236ce938fdf3ffe20b1f77c4f7058ddaadf1 (patch) | |
| tree | 18e1ef8060d5af1ab12b7f47cbf0606adf7a6d3c | |
| parent | 198bd9db02950d261c83b0c383fe737df3c5f152 (diff) | |
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.
| -rw-r--r-- | modules/etc/config.py | 6 | ||||
| -rw-r--r-- | 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") |