From 8161c1d71c629fff10f32ed54ef311f2b936f9ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tam=C3=A1s=20B=C3=A1lint=20Misius?= Date: Fri, 21 Oct 2022 06:22:07 +0200 Subject: [PATCH] Fix font not being given the json dependency Also make it and render get built as dynamic executables on ghactions, and disable dynamic+LTO, as it seems to be buggy in certain cases and isn't an important case. --- .github/build.sh | 6 ++++-- meson.build | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/build.sh b/.github/build.sh index c7a824d06..7e1fb295c 100755 --- a/.github/build.sh +++ b/.github/build.sh @@ -171,7 +171,7 @@ meson_configure+=$'\t'-Db_strip=false meson_configure+=$'\t'-Db_staticpic=false meson_configure+=$'\t'-Dinstall_check=true meson_configure+=$'\t'-Dmod_id=$MOD_ID -if [[ $BSH_HOST_ARCH-$BSH_HOST_PLATFORM-$BSH_HOST_LIBC-$BSH_STATIC_DYNAMIC == x86_64-linux-gnu-static ]]; then +if [[ $BSH_HOST_ARCH-$BSH_HOST_PLATFORM-$BSH_HOST_LIBC == x86_64-linux-gnu ]]; then meson_configure+=$'\t'-Dbuild_render=true meson_configure+=$'\t'-Dbuild_font=true fi @@ -235,8 +235,10 @@ if [[ $BSH_HOST_PLATFORM-$BSH_HOST_LIBC == windows-mingw ]]; then if [[ $BSH_BUILD_PLATFORM == linux ]]; then meson_configure+=$'\t'--cross-file=.github/mingw-ghactions.ini fi -else +fi +if [[ $BSH_HOST_PLATFORM-$BSH_HOST_LIBC != windows-mingw ]] && [[ $BSH_STATIC_DYNAMIC == static ]]; then # LTO simply doesn't work with MinGW. I have no idea why and I also don't care. + # It also has a tendency to not play well with dynamic libraries. meson_configure+=$'\t'-Db_lto=true fi if [[ $BSH_HOST_PLATFORM-$BSH_HOST_ARCH == darwin-aarch64 ]]; then diff --git a/meson.build b/meson.build index 7896a7414..250a74286 100644 --- a/meson.build +++ b/meson.build @@ -405,6 +405,7 @@ if get_option('build_font') zlib_dep, sdl2_dep, bzip2_dep, + json_dep, ] executable( 'font',