Skip to content

Commit c6e81a0

Browse files
oddbookwormpmp-p
andauthored
Base header (#3486)
* Split off declarations of base module to header and exposed everything externally for potential unit tests * Split off base declarations to base.h, and remove static linkage for future unit test purposes * Should fix WASM build * Test a static.c change * WASM compatibility, courtesy of pmp-p Co-authored-by: pmp-p <[email protected]> * re-include base.h for declarations to exist * Moved static.c to base.c * Removed (probably) unnecessary declaration of pgExc_SDLError * for meson build test * wasm meson build test ( no _sdl2 ) * ok no _sdl2 * fence _sdl2, in for non-meson * _sdl2 ok * Fix volatile linkage for c_api * Fix Emscripten build * WASM fixes * remove unnecessary preprocessing in mixer module definition --------- Co-authored-by: pmp-p <[email protected]>
1 parent b7f0c25 commit c6e81a0

File tree

8 files changed

+978
-885
lines changed

8 files changed

+978
-885
lines changed

buildconfig/Setup.Emscripten.SDL2.in

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,24 +25,22 @@ _sdl2.video = src_c/void.c
2525

2626
_sdl2.mixer src_c/_sdl2/mixer.c $(SDL) $(MIXER) $(DEBUG) -Isrc_c
2727

28-
constants src_c/constants.c $(SDL) $(DEBUG)
2928
mask src_c/bitmask.c
30-
math src_c/math.c $(SDL) $(DEBUG)
3129

3230
#GFX = src_c/SDL_gfx/SDL_gfxBlitFunc.c src_c/SDL_gfx/SDL_gfxPrimitives.c
3331
GFX = src_c/SDL_gfx/SDL_gfxPrimitives.c
3432

3533

36-
static src_c/static.c $(SDL) $(FREETYPE) $(FONT) $(MIXER) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
34+
static src_c/base.c $(SDL) $(FREETYPE) $(FONT) $(MIXER) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)
3735

38-
# these should not be altered they already are in static.c merging file above
36+
# these should not be altered they already are in base.c merging file above
3937
time src_c/void.c
4038
_freetype src_c/void.c
4139
imageext src_c/void.c
4240
image src_c/void.c
43-
base src_c/void.c
4441
bufferproxy src_c/void.c
4542
color src_c/void.c
43+
constants src_c/void.c
4644
controller src_c/void.c
4745
controller_old src_c/void.c
4846
display src_c/void.c
@@ -53,6 +51,7 @@ gfxdraw src_c/void.c
5351
joystick src_c/void.c
5452
key src_c/void.c
5553
newbuffer src_c/void.c
54+
math src_c/void.c
5655
mixer_music src_c/void.c
5756
mixer src_c/void.c
5857
mouse src_c/void.c

0 commit comments

Comments
 (0)