Skip to content

Exclude threading in wasm build. #344

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 2 commits into from
May 1, 2025
Merged

Exclude threading in wasm build. #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9ad4d0
Add error checking to SDL_init
mooinglemur May 1, 2025
e6330a0
conditionalize pthreads to exclude from wasm build
mooinglemur May 1, 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
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ endif

CFLAGS=-std=c11 -O3 -Wall -Werror -g $(shell $(SDL2CONFIG) --cflags) -Isrc/extern/include
CXXFLAGS=-std=c++17 -O3 -Wall -Werror -Isrc/extern/ymfm/src
LDFLAGS=$(shell $(SDL2CONFIG) --libs) -lm -lz -pthread
LDFLAGS=$(shell $(SDL2CONFIG) --libs) -lm -lz

ifdef ADDL_INCLUDE
CFLAGS+=-I$(ADDL_INCLUDE)
Expand Down Expand Up @@ -77,6 +77,8 @@ ifdef EMSCRIPTEN
CFLAGS+=-s USE_ZLIB=1
X16_OUTPUT=x16emu.html
MAKECART_OUTPUT=makecart.html
else
LDFLAGS+=-pthread
endif

ifeq ($(FLUIDSYNTH),1)
Expand Down
6 changes: 5 additions & 1 deletion src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1261,7 +1261,11 @@ main(int argc, char **argv)
#ifdef SDL_HINT_SCREENSAVER_INHIBIT_ACTIVITY_NAME
SDL_SetHint(SDL_HINT_SCREENSAVER_INHIBIT_ACTIVITY_NAME, "Emulating modern retro awesomeness");
#endif
SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_AUDIO | SDL_INIT_TIMER);
int e = SDL_Init(SDL_INIT_VIDEO | SDL_INIT_EVENTS | SDL_INIT_GAMECONTROLLER | SDL_INIT_AUDIO | SDL_INIT_TIMER);
if (e < 0) {
fprintf(stderr, "SDL_Init failed: %s\n", SDL_GetError());
exit(-1);
}
audio_init(audio_dev_name, audio_buffers);
video_init(window_scale, screen_x_scale, scale_quality, fullscreen, window_opacity);
}
Expand Down