fix: use correct dependencies names in emscripten

some have -mt, some have the format name in it, so cover all that cases
only use mp3 as music format

Author: Totto16

platforms/build-web.sh

@@ -19,7 +19,7 @@ fi
 EMSDK_QUIET=1 source "$EMSCRIPTEN_ROOT/emsdk_env.sh" >/dev/null
 
 ## build theneeded dependencies
-embuilder build sdl2 harfbuzz freetype zlib sdl2_ttf vorbis mpg123 ogg libmodplug sdl2_mixer libpng libjpeg "sdl2_image:formats=png,jpg,svg" icu
+embuilder build sdl2-mt harfbuzz-mt freetype zlib sdl2_ttf mpg123 sdl2_mixer_mp3 libpng-mt libjpeg "sdl2_image:formats=png,jpg,svg" icu-mt
 
 export EMSCRIPTEN_SYS_ROOT="$EMSCRIPTEN_ROOT/upstream/emscripten/cache/sysroot"
 
@@ -38,7 +38,7 @@ export ENDIANESS="little"
 
 export ROMFS="platforms/romfs"
 
-export PACKAGE_FLAGS="'--use-port=sdl2', '--use-port=harfbuzz', '--use-port=freetype', '--use-port=zlib', '--use-port=sdl2_ttf', '--use-port=vorbis', '--use-port=mpg123', '--use-port=ogg', '--use-port=libmodplug', '--use-port=sdl2_mixer', '-sSDL2_MIXER_FORMATS=[\"ogg\",\"mp3\",\" mod\"]','--use-port=libpng', '--use-port=libjpeg', '--use-port=sdl2_image', '-sSDL2_IMAGE_FORMATS=[\"png\",\"jpg\",\"svg\"]','--use-port=icu'"
+export PACKAGE_FLAGS="'--use-port=sdl2', '--use-port=harfbuzz', '--use-port=freetype', '--use-port=zlib', '--use-port=sdl2_ttf', '--use-port=mpg123', '--use-port=sdl2_mixer', '-sSDL2_MIXER_FORMATS=[\"mp3\"]','--use-port=libpng', '--use-port=libjpeg', '--use-port=sdl2_image','-sSDL2_IMAGE_FORMATS=[\"png\",\"jpg\",\"svg\"]', '--use-port=icu'"
 
 export COMMON_FLAGS="'-fexceptions', '-pthread', '-sEXCEPTION_CATCHING_ALLOWED=[..]', $PACKAGE_FLAGS"
 

tools/dependencies/meson.build

@@ -48,11 +48,22 @@ if meson.is_cross_build()
         only_allow_native_libs = true
 
         ## map native libraries to dependencies
-        map_native_dependencies = ['SDL2-mt', 'SDL2_ttf', 'mpg123', 'SDL2_mixer', 'SDL2_image']
-        foreach map_native_dependency : map_native_dependencies
-            native_dep = cpp.find_library(map_native_dependency, required: true)
+        map_native_dependencies = [
+            ['SDL2-mt', 'SDL2'],
+            ['SDL2_ttf'],
+            ['mpg123'],
+            ['SDL2_mixer_mp3', 'SDL2_mixer'],
+            ['SDL2_image_jpg-png-svg', 'SDL2_image'],
+            ['icu_common-mt', 'icu-uc'],
+        ]
+        foreach native_dependency_tuple : map_native_dependencies
+            native_dep_lib_name = native_dependency_tuple[0]
+
+            native_dep_name = native_dependency_tuple.length() == 2 ? native_dependency_tuple[1] : native_dep_lib_name
+
+            native_dep = cpp.find_library(native_dep_lib_name, required: true)
 
-            if map_native_dependency == 'SDL2-mt'
+            if native_dep_name == 'SDL2'
 
                 major_version = cpp.get_define(
                     'SDL_MAJOR_VERSION',
@@ -89,9 +100,9 @@ if meson.is_cross_build()
                     + '.'
                     + patch_version,
                 )
-                meson.override_dependency('SDL2', native_dep_with_version)
+                meson.override_dependency(native_dep_name, native_dep_with_version)
             else
-                meson.override_dependency(map_native_dependency, native_dep)
+                meson.override_dependency(native_dep_name, native_dep)
 
             endif
 
@@ -105,10 +116,8 @@ if meson.is_cross_build()
             'freetype',
             'harfbuzz-mt',
             'z',
-            'vorbis',
-            'ogg',
-            'modplug',
-            'png',
+            'mpg123',
+            'png-mt',
             'jpeg',
             'fetch-mt',
         ]