static load ok

Author: pmp-p

support/__EMSCRIPTEN__.c

@@ -60,7 +60,7 @@ self hosting:
 
 #include <unistd.h>
 
-extern void Inittab_pygame();
+extern void pygame_Inittab();
 //extern PyMODINIT_FUNC PyInit_pygame_static(void);
 
 static long long embed = 0;
@@ -466,8 +466,7 @@ main(int argc, char **argv)
 #endif
 
     PyImport_AppendInittab("embed", init_embed);
-    //PyImport_AppendInittab("pygame_static", PyInit_pygame_static);
-    Inittab_pygame();
+    pygame_Inittab();
 
     setenv("TERM","xterm", 1);
     setenv("TERMINFO", "/usr/share/terminfo", 1);

support/__EMSCRIPTEN__.overlay/pygame/__init__.py

@@ -83,12 +83,10 @@ def warn(self):
 
 # this is a special loader for WebAssembly platform
 # where pygame is actually statically linked
-
+# mixing single phase (C) and multiphase modules (cython)
 if sys.platform in ("wasi", "emscripten"):
     import pygame_static
 
-    pygame_static.load_into(sys.modules)
-
     pygame = sys.modules[__name__]
 
     pygame.Color = pygame.color.Color
@@ -107,13 +105,9 @@ def warn(self):
     import importlib.machinery
 
     loader = importlib.machinery.FrozenImporter
-    for alias in ("sdl2", "audio", "video", "controller", "mixer"):
+    spec = importlib.machinery.ModuleSpec("", loader)
+    pygame_static.import_cython(spec)
 
-        spec = importlib.machinery.ModuleSpec(alias, loader)
-        try:
-            pygame_static.load_sdl2(sys.modules, spec, alias)
-        except:
-            vars(pygame._sdl2)[alias] = MissingModule(alias, urgent=1)
 
 # we need to import like this, each at a time. the cleanest way to import
 # our modules is with the import command (not the __import__ function)