WASM compatibility, courtesy of pmp-p

Co-authored-by: pmp-p <[email protected]>

Author: oddbookworm

src_c/base.c

@@ -22,13 +22,27 @@
 #define NO_PYGAME_C_API
 #define PYGAMEAPI_BASE_INTERNAL
 
+#if defined(BUILD_STATIC)
+#define CONTROLLER_NOPYX
+#define PYGAMEAPI_RECT_INTERNAL
+#define PYGAMEAPI_EVENT_INTERNAL
+#define PYGAMEAPI_JOYSTICK_INTERNAL
+#define PYGAMEAPI_BASE_INTERNAL
+#define PYGAMEAPI_SURFACE_INTERNAL
+#define PYGAMEAPI_BUFFERPROXY_INTERNAL
+#define PYGAMEAPI_WINDOW_INTERNAL
+#define PYGAMEAPI_RENDER_INTERNAL
+#endif
+
 #include "base.h"
 
 PG_PixelFormatEnum pg_default_convert_format = 0;
 
 /* Custom exceptions */
 PyObject *pgExc_BufferError = NULL;
 
+PyObject *pgExc_SDLError;
+
 /* Only one instance of the state per process. */
 static PyObject *pg_quit_functions = NULL;
 static int pg_is_init = 0;
@@ -2231,3 +2245,7 @@ MODINIT_DEFINE(base)
     Py_XDECREF(module);
     return NULL;
 }
+
+#if defined(__EMSCRIPTEN__) || defined(__wasi__)
+#include "static.c"
+#endif

src_c/include/_pygame.h

@@ -208,6 +208,7 @@ typedef struct {
 
 #define pgRect_AsRect(x) (((pgRectObject *)x)->r)
 #define pgFRect_AsRect(x) (((pgFRectObject *)x)->r)
+
 #ifndef PYGAMEAPI_RECT_INTERNAL
 #define pgRect_Type (*(PyTypeObject *)PYGAMEAPI_GET_SLOT(rect, 0))
 

src_c/static.c

@@ -11,9 +11,11 @@
 #define PYGAMEAPI_WINDOW_INTERNAL
 #define PYGAMEAPI_RENDER_INTERNAL
 
+#if 0
 #define pgSurface_New(surface) (pgSurfaceObject *)pgSurface_New2((surface), 1)
 #define pgSurface_NewNoOwn(surface) \
     (pgSurfaceObject *)pgSurface_New2((surface), 0)
+#endif
 
 #include "pygame.h"
 #include "Python.h"
@@ -49,6 +51,10 @@ import_pygame_surface(void)
 {
 }
 
+#ifdef import_pygame_window
+#undef import_pygame_window
+#endif
+
 void
 import_pygame_window(void)
 {
@@ -89,6 +95,10 @@ import_pygame_event(void)
 {
 }
 
+#ifdef import_pygame_joystick
+#undef import_pygame_joystick
+#endif
+
 void
 import_pygame_joystick(void)
 {
@@ -113,6 +123,8 @@ import_pygame_pixelarray(void)
 {
 }
 
+PyMODINIT_FUNC
+PyInit_base(void);
 PyMODINIT_FUNC
 PyInit_color(void);
 PyMODINIT_FUNC
@@ -322,6 +334,10 @@ PyInit_pygame_static()
     // for correct input in wasm worker
     SDL_SetHint("SDL_EMSCRIPTEN_KEYBOARD_ELEMENT", "1");
 
+    // base module is including current file
+    // all globals are accessible from here.
+    load_submodule("pygame", PyInit_base(), "base");
+
     load_submodule("pygame", PyInit_constants(), "constants");
     //
     load_submodule("pygame", PyInit_pg_math(), "math");
@@ -391,7 +407,7 @@ PyInit_pygame_static()
 
 #endif  // defined(BUILD_STATIC)
 
-#include "base.h"
+// #include "base.h"
 
 #include "rect.c"
 #include "pgcompat_rect.c"