Skip to content

Commit 21d9dd8

Browse files
authored
Add multi-threading variants to sdl2_mixer (emscripten-core#23094)
I added support for multi threading (-pthread) to the sdl2_mixer port. For me this was kind of new but I did try to follow the prinziples of the sdl2_image adn sdl2_ttf (emscripten-core#22946) changes. I also changed the "_" to "-" for consistency.
1 parent 8f63761 commit 21d9dd8

File tree

1 file changed

+10
-3
lines changed

1 file changed

+10
-3
lines changed

tools/ports/sdl2_mixer.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,10 @@
1010

1111
deps = ['sdl2']
1212
variants = {
13-
'sdl2_mixer_mp3': {'SDL2_MIXER_FORMATS': ["mp3"]},
14-
'sdl2_mixer_none': {'SDL2_MIXER_FORMATS': []},
13+
'sdl2_mixer-mp3': {'SDL2_MIXER_FORMATS': ['mp3']},
14+
'sdl2_mixer-none': {'SDL2_MIXER_FORMATS': []},
15+
'sdl2_mixer-mp3-mt': {'SDL2_MIXER_FORMATS': ['mp3'], 'PTHREADS': 1},
16+
'sdl2_mixer-none-mt': {'SDL2_MIXER_FORMATS': [], 'PTHREADS': 1},
1517
}
1618

1719

@@ -25,7 +27,9 @@ def get_lib_name(settings):
2527

2628
libname = 'libSDL2_mixer'
2729
if formats != '':
28-
libname += '_' + formats
30+
libname += '-' + formats
31+
if settings.PTHREADS:
32+
libname += '-mt'
2933
libname += '.a'
3034

3135
return libname
@@ -68,6 +72,9 @@ def create(final):
6872
'-DMUSIC_MID_TIMIDITY',
6973
]
7074

75+
if settings.PTHREADS:
76+
flags.append('-pthread')
77+
7178
build_dir = ports.clear_project_build('sdl2_mixer')
7279
include_path = os.path.join(source_path, 'include')
7380
includes = [

0 commit comments

Comments
 (0)