diff --git a/SConstruct b/SConstruct
index 63105bfa844..3056e03d481 100644
--- a/SConstruct
+++ b/SConstruct
@@ -396,7 +396,17 @@ if selected_platform in platform_list:
         sys.path.append(tmppath)
         env.current_module = x
         import config
-        if (config.can_build(selected_platform)):
+        # can_build changed number of arguments between 3.0 (1) and 3.1 (2),
+        # so try both to preserve compatibility for 3.0 modules
+        can_build = False
+        try:
+            can_build = config.can_build(env, selected_platform)
+        except TypeError:
+            print("Warning: module '%s' uses a deprecated `can_build` "
+                  "signature in its config.py file, it should be "
+                  "`can_build(env, platform)`." % x)
+            can_build = config.can_build(selected_platform)
+        if (can_build):
             config.configure(env)
             env.module_list.append(x)
             try:
diff --git a/modules/bmp/config.py b/modules/bmp/config.py
index fb920482f5f..1c8cd12a2dc 100644
--- a/modules/bmp/config.py
+++ b/modules/bmp/config.py
@@ -1,7 +1,5 @@
-
-def can_build(platform):
+def can_build(env, platform):
     return True
 
-
 def configure(env):
     pass
diff --git a/modules/bullet/config.py b/modules/bullet/config.py
index 0a31c2e503b..92dbcf5cb0d 100644
--- a/modules/bullet/config.py
+++ b/modules/bullet/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/csg/config.py b/modules/csg/config.py
index 5e1d9167902..38ccc66d915 100644
--- a/modules/csg/config.py
+++ b/modules/csg/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/dds/config.py b/modules/dds/config.py
index 5f133eba90f..1c8cd12a2dc 100644
--- a/modules/dds/config.py
+++ b/modules/dds/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/enet/config.py b/modules/enet/config.py
index 8031fbb4b6f..3e30bbe778f 100644
--- a/modules/enet/config.py
+++ b/modules/enet/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/etc/config.py b/modules/etc/config.py
index 395fc1bb02c..098f1eafa9e 100644
--- a/modules/etc/config.py
+++ b/modules/etc/config.py
@@ -1,9 +1,5 @@
-def can_build(platform):
-    return True
+def can_build(env, platform):
+    return env['tools']
 
 def configure(env):
-    # Tools only, disabled for non-tools
-    # TODO: Find a cleaner way to achieve that
-    if not env['tools']:
-        env['module_etc_enabled'] = False
-        env.disabled_modules.append("etc")
+    pass
diff --git a/modules/freetype/config.py b/modules/freetype/config.py
index 5f133eba90f..1c8cd12a2dc 100644
--- a/modules/freetype/config.py
+++ b/modules/freetype/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/gdnative/config.py b/modules/gdnative/config.py
index 68148c4d87a..626e9239f85 100644
--- a/modules/gdnative/config.py
+++ b/modules/gdnative/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/gdscript/config.py b/modules/gdscript/config.py
index 6496b59d756..95b40d90af0 100644
--- a/modules/gdscript/config.py
+++ b/modules/gdscript/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/gridmap/config.py b/modules/gridmap/config.py
index a93f4edb810..5022116c9b1 100644
--- a/modules/gridmap/config.py
+++ b/modules/gridmap/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/hdr/config.py b/modules/hdr/config.py
index 5f133eba90f..1c8cd12a2dc 100644
--- a/modules/hdr/config.py
+++ b/modules/hdr/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/jpg/config.py b/modules/jpg/config.py
index 5f133eba90f..1c8cd12a2dc 100644
--- a/modules/jpg/config.py
+++ b/modules/jpg/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/mbedtls/config.py b/modules/mbedtls/config.py
index 5f133eba90f..1c8cd12a2dc 100755
--- a/modules/mbedtls/config.py
+++ b/modules/mbedtls/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/mobile_vr/config.py b/modules/mobile_vr/config.py
index aa8ef111d32..4912457e2b9 100644
--- a/modules/mobile_vr/config.py
+++ b/modules/mobile_vr/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     # should probably change this to only be true on iOS and Android
     return False
 
diff --git a/modules/mono/config.py b/modules/mono/config.py
index 18d9c67795c..3afb8a88921 100644
--- a/modules/mono/config.py
+++ b/modules/mono/config.py
@@ -19,7 +19,7 @@ def find_file_in_dir(directory, files, prefix='', extension=''):
     return ''
 
 
-def can_build(platform):
+def can_build(env, platform):
     if platform in ["javascript"]:
         return False # Not yet supported
     return True
diff --git a/modules/ogg/config.py b/modules/ogg/config.py
index 5f133eba90f..1c8cd12a2dc 100644
--- a/modules/ogg/config.py
+++ b/modules/ogg/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/opus/config.py b/modules/opus/config.py
index 60f8d838d60..a1cde10ea05 100644
--- a/modules/opus/config.py
+++ b/modules/opus/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/pvr/config.py b/modules/pvr/config.py
index 5f133eba90f..1c8cd12a2dc 100644
--- a/modules/pvr/config.py
+++ b/modules/pvr/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/recast/config.py b/modules/recast/config.py
index fc074cf6612..098f1eafa9e 100644
--- a/modules/recast/config.py
+++ b/modules/recast/config.py
@@ -1,5 +1,5 @@
-def can_build(platform):
-    return platform != "android"
+def can_build(env, platform):
+    return env['tools']
 
 def configure(env):
     pass
diff --git a/modules/regex/config.py b/modules/regex/config.py
index cb2da267383..42cfe3b43c1 100644
--- a/modules/regex/config.py
+++ b/modules/regex/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/squish/config.py b/modules/squish/config.py
index 97c95999c87..098f1eafa9e 100644
--- a/modules/squish/config.py
+++ b/modules/squish/config.py
@@ -1,9 +1,5 @@
-def can_build(platform):
-    return True
+def can_build(env, platform):
+    return env['tools']
 
 def configure(env):
-    # Tools only, disabled for non-tools
-    # TODO: Find a cleaner way to achieve that
-    if not env['tools']:
-        env['module_squish_enabled'] = False
-        env.disabled_modules.append("squish")
+    pass
diff --git a/modules/stb_vorbis/config.py b/modules/stb_vorbis/config.py
index defe8d0c94f..d75e41797ae 100644
--- a/modules/stb_vorbis/config.py
+++ b/modules/stb_vorbis/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/svg/config.py b/modules/svg/config.py
index 5f133eba90f..1c8cd12a2dc 100644
--- a/modules/svg/config.py
+++ b/modules/svg/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/tga/config.py b/modules/tga/config.py
index 5f133eba90f..1c8cd12a2dc 100644
--- a/modules/tga/config.py
+++ b/modules/tga/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/thekla_unwrap/config.py b/modules/thekla_unwrap/config.py
index b1ce7d4b918..bd092bdc161 100644
--- a/modules/thekla_unwrap/config.py
+++ b/modules/thekla_unwrap/config.py
@@ -1,7 +1,5 @@
-def can_build(platform):
-    return platform != "android" and platform != "ios"
+def can_build(env, platform):
+    return (env['tools'] and platform not in ["android", "ios"])
 
 def configure(env):
-    if not env['tools']:
-        env['builtin_thekla_atlas'] = False
-        env.disabled_modules.append("thekla_unwrap")
+    pass
diff --git a/modules/theora/config.py b/modules/theora/config.py
index 34d34f8be2f..75041662372 100644
--- a/modules/theora/config.py
+++ b/modules/theora/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/tinyexr/config.py b/modules/tinyexr/config.py
index e12bb398ceb..098f1eafa9e 100644
--- a/modules/tinyexr/config.py
+++ b/modules/tinyexr/config.py
@@ -1,9 +1,5 @@
-def can_build(platform):
-    return True
+def can_build(env, platform):
+    return env['tools']
 
 def configure(env):
-    # Tools only, disabled for non-tools
-    # TODO: Find a cleaner way to achieve that
-    if not env['tools']:
-        env['module_tinyexr_enabled'] = False
-        env.disabled_modules.append("tinyexr")
+    pass
diff --git a/modules/visual_script/config.py b/modules/visual_script/config.py
index 6b1ce410146..07a04507345 100644
--- a/modules/visual_script/config.py
+++ b/modules/visual_script/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/vorbis/config.py b/modules/vorbis/config.py
index 5f133eba90f..1c8cd12a2dc 100644
--- a/modules/vorbis/config.py
+++ b/modules/vorbis/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/webm/config.py b/modules/webm/config.py
index dcae4447d5b..72a40734234 100644
--- a/modules/webm/config.py
+++ b/modules/webm/config.py
@@ -1,5 +1,5 @@
-def can_build(platform):
-    return platform != 'iphone'
+def can_build(env, platform):
+    return platform not in ['iphone']
 
 def configure(env):
     pass
diff --git a/modules/webp/config.py b/modules/webp/config.py
index 5f133eba90f..1c8cd12a2dc 100644
--- a/modules/webp/config.py
+++ b/modules/webp/config.py
@@ -1,4 +1,4 @@
-def can_build(platform):
+def can_build(env, platform):
     return True
 
 def configure(env):
diff --git a/modules/websocket/config.py b/modules/websocket/config.py
index 399ca88fc1b..f59ef432b4e 100644
--- a/modules/websocket/config.py
+++ b/modules/websocket/config.py
@@ -1,8 +1,6 @@
-
-def can_build(platform):
+def can_build(env, platform):
     return True
 
-
 def configure(env):
     pass