Skip to content

Commit 2898d62

Browse files
committed
fix: only use png and svgs, since jpeg isn't available with mt support
also convert the mgerhold.jpg to png
1 parent 2d0f123 commit 2898d62

File tree

5 files changed

+4
-5
lines changed

5 files changed

+4
-5
lines changed

assets/authors/mgerhold.jpg

-49.8 KB
Binary file not shown.

assets/authors/mgerhold.png

381 KB
Loading

platforms/build-web.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ fi
1919
EMSDK_QUIET=1 source "$EMSCRIPTEN_ROOT/emsdk_env.sh" >/dev/null
2020

2121
## build theneeded dependencies
22-
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
22+
embuilder build sdl2-mt harfbuzz-mt freetype zlib sdl2_ttf mpg123 sdl2_mixer_mp3 libpng-mt "sdl2_image:formats=png,svg" icu-mt
2323

2424
export EMSCRIPTEN_SYS_ROOT="$EMSCRIPTEN_ROOT/upstream/emscripten/cache/sysroot"
2525

@@ -38,7 +38,7 @@ export ENDIANESS="little"
3838

3939
export ROMFS="platforms/romfs"
4040

41-
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'"
41+
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=sdl2_image','-sSDL2_IMAGE_FORMATS=[\"png\",\"svg\"]', '--use-port=icu'"
4242

4343
export COMMON_FLAGS="'-fexceptions', '-pthread', '-sEXCEPTION_CATCHING_ALLOWED=[..]', $PACKAGE_FLAGS"
4444

src/scenes/about_page/about_page.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace scenes {
1515

1616
static constexpr std::initializer_list<std::tuple<const char* const, const char* const, const char* const>>
1717
authors{
18-
{ "mgerhold", "https://github.com/mgerhold", "mgerhold.jpg" },
18+
{ "mgerhold", "https://github.com/mgerhold", "mgerhold.png" },
1919
{ "Totto16", "https://github.com/Totto16", "Totto16.png" }
2020
};
2121

tools/dependencies/meson.build

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if meson.is_cross_build()
5353
['SDL2_ttf'],
5454
['mpg123'],
5555
['SDL2_mixer_mp3', 'SDL2_mixer'],
56-
['SDL2_image_jpg-png-svg', 'SDL2_image'],
56+
['SDL2_image_png-svg', 'SDL2_image'],
5757
['icu_common-mt', 'icu-uc'],
5858
]
5959
foreach native_dependency_tuple : map_native_dependencies
@@ -118,7 +118,6 @@ if meson.is_cross_build()
118118
'z',
119119
'mpg123',
120120
'png-mt',
121-
'jpeg',
122121
'fetch-mt',
123122
]
124123

0 commit comments

Comments
 (0)