add _sprite + _sdl2.video to inittab (former require latter)

Author: pmp-p

buildconfig/Setup.Emscripten.SDL2.in

@@ -11,68 +11,64 @@
 
 DEBUG =
 
-
-
+# these can build alone and object files merged with ar
 
 _sdl2.sdl2 src_c/_sdl2/sdl2.c $(SDL) $(DEBUG) -Isrc_c
+
 _sdl2.audio src_c/_sdl2/audio.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.video src_c/_sdl2/video.c src_c/pgcompat.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.mixer src_c/_sdl2/mixer.c $(SDL) $(MIXER) $(DEBUG) -Isrc_c
-_sdl2.touch src_c/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc_c
-#_sdl2.controller src_c/_sdl2/controller.c $(SDL) $(DEBUG) -Isrc_c
-_sdl2.controller src_c/void.c
 
-GFX = src_c/SDL_gfx/SDL_gfxPrimitives.c
-#GFX = src_c/SDL_gfx/SDL_gfxBlitFunc.c src_c/SDL_gfx/SDL_gfxPrimitives.c
-gfxdraw src_c/gfxdraw.c $(SDL) $(GFX) $(DEBUG)
+pygame_sdl2_video src_c/_sdl2/video.c src_c/pgcompat.c $(SDL) $(DEBUG) -Isrc_c
+_sdl2.video = src_c/void.c
 
 
+_sdl2.mixer src_c/_sdl2/mixer.c $(SDL) $(MIXER) $(DEBUG) -Isrc_c
 
+constants src_c/constants.c $(SDL) $(DEBUG)
+mask src_c/bitmask.c
+_sprite src_c/_sprite.c $(SDL) $(DEBUG)
+math src_c/math.c $(SDL) $(DEBUG)
+
+#GFX = src_c/SDL_gfx/SDL_gfxBlitFunc.c src_c/SDL_gfx/SDL_gfxPrimitives.c
+GFX = src_c/SDL_gfx/SDL_gfxPrimitives.c
 
 
 static src_c/static.c $(SDL) $(FREETYPE) $(FONT) $(MIXER) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
 
-
-# these should not be altered
-rect src_c/void.c
-display src_c/void.c
-rwobject src_c/void.c
-event src_c/void.c
-mouse src_c/void.c
-key src_c/void.c
-joystick src_c/void.c
+# these should not be altered they already are in static.c merging file above
 time src_c/void.c
-
 _freetype src_c/void.c
+imageext src_c/void.c
+image src_c/void.c
+base src_c/void.c
+bufferproxy src_c/void.c
+color src_c/void.c
+controller src_c/void.c
+display src_c/void.c
+draw src_c/void.c
+event src_c/void.c
 font src_c/void.c
-mixer src_c/void.c
+gfxdraw  src_c/void.c
+joystick src_c/void.c
+key src_c/void.c
+newbuffer  src_c/void.c
 mixer_music src_c/void.c
-
-draw src_c/void.c
-controller src_c/void.c
-
+mixer src_c/void.c
+mouse src_c/void.c
+pixelcopy src_c/void.c
+pixelarray src_c/void.c
 surface src_c/void.c
 surflock src_c/void.c
+rect src_c/void.c
+rwobject src_c/void.c
 
-color src_c/void.c
-bufferproxy src_c/void.c
-
-imageext src_c/void.c
-
-image src_c/void.c
-
-mask src_c/bitmask.c
 
-_sprite src_c/_sprite.c $(SDL) $(DEBUG)
+#_sdl2.controller src_c/_sdl2/controller.c $(SDL) $(DEBUG) -Isrc_c
+_sdl2.controller src_c/void.c
 
-#base src_c/base.c $(SDL) $(DEBUG)
-base src_c/void.c
+#_sdl2.touch src_c/_sdl2/touch.c $(SDL) $(DEBUG) -Isrc_c
+_sdl2.touch src_c/void.c
 
-constants src_c/constants.c $(SDL) $(DEBUG)
-transform src_c/transform.c src_c/rotozoom.c src_c/scale2x.c src_c/scale_mmx.c $(SDL) $(DEBUG) -D_NO_MMX_FOR_X86_64
+#transform src_c/transform.c src_c/rotozoom.c src_c/scale2x.c src_c/scale_mmx.c $(SDL) $(DEBUG) -D_NO_MMX_FOR_X86_64
+transform src_c/void.c
 
 
-pixelarray src_c/pixelarray.c $(SDL) $(DEBUG)
-math src_c/math.c $(SDL) $(DEBUG)
-pixelcopy src_c/pixelcopy.c $(SDL) $(DEBUG)
-newbuffer src_c/newbuffer.c $(SDL) $(DEBUG)

src_c/alphablit.c

@@ -285,6 +285,7 @@ SoftBlitPyGame(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst,
                     break;
                 }
                 case PYGAME_BLEND_RGBA_MULT: {
+#if !defined(__EMSCRIPTEN__)
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN
                     if (src->format->BytesPerPixel == 4 &&
                         dst->format->BytesPerPixel == 4 &&
@@ -321,6 +322,7 @@ SoftBlitPyGame(SDL_Surface *src, SDL_Rect *srcrect, SDL_Surface *dst,
                     }
 #endif /* PG_ENABLE_ARM_NEON */
 #endif /* SDL_BYTEORDER == SDL_LIL_ENDIAN */
+#endif /* __EMSCRIPTEN__ */
                     /* if we call MULT_RGBA on a surface without alpha
                        we will be forced down this slow non-SIMD path
                        right now. When we upgrade RGB_MULT to SIMD

src_c/pixelarray.c

@@ -27,12 +27,12 @@
 #include "doc/pixelarray_doc.h"
 
 #include "surface.h"
-
+#if !defined(BUILD_STATIC)
 static char FormatUint8[] = "B";
 static char FormatUint16[] = "=H";
 static char FormatUint24[] = "3x";
 static char FormatUint32[] = "=I";
-
+#endif
 struct _pixelarray_t;
 
 /* The array, like its surface, is in column-major (FORTRAN) order.

src_c/static.c

@@ -6,7 +6,7 @@
 #define PYGAMEAPI_BASE_INTERNAL
 #define PYGAMEAPI_SURFACE_INTERNAL
 
-#define pgSurface_New(surface) pgSurface_New2((surface), 1)
+#define pgSurface_New(surface) (pgSurfaceObject *)pgSurface_New2((surface), 1)
 #define pgSurface_NewNoOwn(surface) \
     (pgSurfaceObject *)pgSurface_New2((surface), 0)
 
@@ -137,6 +137,12 @@ PyInit_controller(void);
 PyMODINIT_FUNC
 PyInit_transform(void);
 
+PyMODINIT_FUNC
+PyInit_video(void);
+
+PyMODINIT_FUNC
+PyInit__sprite(void);
+
 void
 PyGame_static_init()
 {
@@ -164,6 +170,8 @@ PyGame_static_init()
     PyImport_AppendInittab("pygame_event", PyInit_event);
     PyImport_AppendInittab("pygame_joystick", PyInit_joystick);
     PyImport_AppendInittab("pygame_time", PyInit_pg_time);
+    PyImport_AppendInittab("pygame_sdl2_video", PyInit_video);
+    PyImport_AppendInittab("pygame_sprite", PyInit__sprite);
     PyImport_AppendInittab("pygame__sdl2_sdl2", PyInit_sdl2);
     PyImport_AppendInittab("pygame__sdl2_sdl2_mixer", PyInit_mixer);
     PyImport_AppendInittab("pygame__sdl2_controller", PyInit_controller);