On 25/08/2020 17:53, luoyongg...@gmail.com wrote:
> From: Yonggang Luo <luoyongg...@gmail.com>
>
> Fixes this for msys2/mingw64 by remove the include_type for sdl2 discovery in
> meson
> ---
> meson.build | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/meson.build b/meson.build
> index f0fe5f8799..1644bbd83c 100644
> --- a/meson.build
> +++ b/meson.build
> @@ -224,8 +224,7 @@ if 'CONFIG_BRLAPI' in config_host
> brlapi = declare_dependency(link_args: config_host['BRLAPI_LIBS'].split())
> endif
>
> -sdl = dependency('sdl2', required: get_option('sdl'), static: enable_static,
> - include_type: 'system')
> +sdl = dependency('sdl2', required: get_option('sdl'), static: enable_static)
> sdl_image = not_found
> if sdl.found()
> # work around 2.0.8 bug
This gets around the issue whereby "-isystem" paths are not escaped correctly on
Windows, presumably by changing them to "-iquote" instead.
Marc-André had a query about why this is marked as a system include, however I
can
confirm that it fixes the missing "SDL.h" issue during build.
ATB,
Mark.
