Explorar el Código

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.
Rémi Verschelde hace 8 años
padre
commit
cb59236ce9
Se han modificado 2 ficheros con 10 adiciones y 2 borrados
  1. 5 1
      modules/etc/config.py
  2. 5 1
      modules/tinyexr/config.py

+ 5 - 1
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")

+ 5 - 1
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")