From 18cb3b7a92d431a4e82cd32602a14a1e6b389176 Mon Sep 17 00:00:00 2001 From: dennis Date: Fri, 6 Dec 2024 18:51:32 +0100 Subject: [PATCH 1/2] Add multi-threading variants to sdl2_mixer --- tools/ports/sdl2_mixer.py | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/ports/sdl2_mixer.py b/tools/ports/sdl2_mixer.py index f77f906d49fdd..a4723fd615210 100644 --- a/tools/ports/sdl2_mixer.py +++ b/tools/ports/sdl2_mixer.py @@ -10,8 +10,10 @@ deps = ['sdl2'] variants = { - 'sdl2_mixer_mp3': {'SDL2_MIXER_FORMATS': ["mp3"]}, - 'sdl2_mixer_none': {'SDL2_MIXER_FORMATS': []}, + 'sdl2_mixer-mp3': {'SDL2_MIXER_FORMATS': ["mp3"]}, + 'sdl2_mixer-none': {'SDL2_MIXER_FORMATS': []}, + 'sdl2_mixer-mp3-mt': {'SDL2_MIXER_FORMATS': ["mp3"], 'PTHREADS': 1}, + 'sdl2_mixer-none-mt': {'SDL2_MIXER_FORMATS': [], 'PTHREADS': 1}, } @@ -25,7 +27,9 @@ def get_lib_name(settings): libname = 'libSDL2_mixer' if formats != '': - libname += '_' + formats + libname += '-' + formats + if settings.PTHREADS: + libname += '-mt' libname += '.a' return libname @@ -68,6 +72,9 @@ def create(final): '-DMUSIC_MID_TIMIDITY', ] + if settings.PTHREADS: + flags.append('-pthread') + build_dir = ports.clear_project_build('sdl2_mixer') include_path = os.path.join(source_path, 'include') includes = [ From df8c44d4673617099747aa2298861c0ed2ad66c4 Mon Sep 17 00:00:00 2001 From: dennis Date: Mon, 6 Jan 2025 18:25:55 +0100 Subject: [PATCH 2/2] Replaced double-quotes with single quotes --- tools/ports/sdl2_mixer.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/ports/sdl2_mixer.py b/tools/ports/sdl2_mixer.py index a4723fd615210..a8aa5747ecf51 100644 --- a/tools/ports/sdl2_mixer.py +++ b/tools/ports/sdl2_mixer.py @@ -10,9 +10,9 @@ deps = ['sdl2'] variants = { - 'sdl2_mixer-mp3': {'SDL2_MIXER_FORMATS': ["mp3"]}, + 'sdl2_mixer-mp3': {'SDL2_MIXER_FORMATS': ['mp3']}, 'sdl2_mixer-none': {'SDL2_MIXER_FORMATS': []}, - 'sdl2_mixer-mp3-mt': {'SDL2_MIXER_FORMATS': ["mp3"], 'PTHREADS': 1}, + 'sdl2_mixer-mp3-mt': {'SDL2_MIXER_FORMATS': ['mp3'], 'PTHREADS': 1}, 'sdl2_mixer-none-mt': {'SDL2_MIXER_FORMATS': [], 'PTHREADS': 1}, }