Skip to content

Base header #3486

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 21 commits into from
Aug 3, 2025
Merged

Base header #3486

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4b9b3d9
Split off declarations of base module to header and exposed everythin…
oddbookworm Jun 7, 2025
e29d1f0
Split off base declarations to base.h, and remove static linkage for …
oddbookworm Jun 8, 2025
612a7bf
Should fix WASM build
oddbookworm Jun 8, 2025
3fde045
Test a static.c change
oddbookworm Jun 10, 2025
b7dc160
Merge branch 'main' of https://github.com/pygame-community/pygame-ce …
oddbookworm Jun 26, 2025
ea2bcb7
WASM compatibility, courtesy of pmp-p
oddbookworm Jun 28, 2025
4659d3f
re-include base.h for declarations to exist
oddbookworm Jun 29, 2025
97c36b3
Moved static.c to base.c
oddbookworm Jun 29, 2025
da19823
Removed (probably) unnecessary declaration of pgExc_SDLError
oddbookworm Jun 29, 2025
484f8bd
for meson build test
pmp-p Jul 20, 2025
f625709
Merge remote-tracking branch 'origin/main' into base-header-wasm
pmp-p Jul 20, 2025
f1b5b7d
wasm meson build test ( no _sdl2 )
pmp-p Jul 20, 2025
3fc9d06
ok no _sdl2
pmp-p Jul 20, 2025
40ca090
fence _sdl2, in for non-meson
pmp-p Jul 20, 2025
2abf526
_sdl2 ok
pmp-p Jul 20, 2025
b1dd184
Merge remote-tracking branch 'origin/main' into base-header-wasm
pmp-p Jul 29, 2025
0b37249
Merge pull request #1 from pmp-p/base-header-wasm
oddbookworm Aug 1, 2025
4a33b0f
Fix volatile linkage for c_api
oddbookworm Aug 1, 2025
b16ebad
Fix Emscripten build
oddbookworm Aug 1, 2025
e5dfb75
WASM fixes
oddbookworm Aug 1, 2025
f3be188
remove unnecessary preprocessing in mixer module definition
oddbookworm Aug 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions buildconfig/Setup.Emscripten.SDL2.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,24 +25,22 @@ _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
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)
static src_c/base.c $(SDL) $(FREETYPE) $(FONT) $(MIXER) $(IMAGE) $(PNG) $(JPEG) $(DEBUG)

# these should not be altered they already are in static.c merging file above
# these should not be altered they already are in base.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
constants src_c/void.c
controller src_c/void.c
controller_old src_c/void.c
display src_c/void.c
Expand All @@ -53,6 +51,7 @@ gfxdraw src_c/void.c
joystick src_c/void.c
key src_c/void.c
newbuffer src_c/void.c
math src_c/void.c
mixer_music src_c/void.c
mixer src_c/void.c
mouse src_c/void.c
Expand Down
Loading
Loading