diff --git a/.ci/build-cs b/.ci/build-cs index 5e033ac..56cf595 100755 --- a/.ci/build-cs +++ b/.ci/build-cs @@ -139,6 +139,9 @@ cd build args="" if [ -n "${cross}" ]; then if [ "${meson_system}" = "windows" ]; then + # avoid having to look the dlls for these up + export CXXFLAGS+=" -static-libgcc -static-libstdc++" + # quiet wine exe wrapper cat << EOF > meson-exewrapper #!/bin/sh export WINEDEBUG=-all diff --git a/tests/meson.build b/tests/meson.build index d5193fe..0ab7991 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -16,6 +16,8 @@ test_runner = executable('runner', penv = environment() penv.append('PATH', join_paths(build_root, 'src')) +# when running tests for crossbuilds in wine, this is used instead +penv.append('WINEPATH', join_paths(build_root, 'src')) foreach tcase: lang_tests test(tcase[0],