diff options
| author | Thomas Huth <thuth@redhat.com> | 2023-06-05 13:45:23 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-06-06 09:42:15 +0200 |
| commit | 6da5f22b65f7147e1f0bd589cbdb072305a13bb7 (patch) | |
| tree | 601fd4a26b9ae8aec41abc9b68262b805ab8b045 | |
| parent | aece7238c4ebf4d95780df95f1a4743a7fa52ca9 (diff) | |
| download | focaccia-qemu-6da5f22b65f7147e1f0bd589cbdb072305a13bb7.tar.gz focaccia-qemu-6da5f22b65f7147e1f0bd589cbdb072305a13bb7.zip | |
meson.build: Use -Wno-undef only for SDL2 versions that need it
There is no need to disable this useful compiler warning for all versions of the SDL. Unfortunately, various versions are buggy (beside SDL 2.0.8, the version 2.26.0 and 2.26.1 are broken, too, see https://github.com/libsdl-org/SDL/issues/6619 ), but we can use a simple compiler check to see whether we need the -Wno-undef or not. This also enables the printing of the version number with good versions of the SDL in the summary of the meson output again. Signed-off-by: Thomas Huth <thuth@redhat.com> Message-Id: <20230605114523.282987-1-thuth@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | meson.build | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/meson.build b/meson.build index 97b32e9beb..6bbeffe571 100644 --- a/meson.build +++ b/meson.build @@ -1273,10 +1273,16 @@ if not get_option('sdl').auto() or have_system sdl_image = not_found endif if sdl.found() - # work around 2.0.8 bug - sdl = declare_dependency(compile_args: '-Wno-undef', - dependencies: sdl, - version: sdl.version()) + # Some versions of SDL have problems with -Wundef + if not cc.compiles(''' + #include <SDL.h> + #include <SDL_syswm.h> + int main(int argc, char *argv[]) { return 0; } + ''', dependencies: sdl, args: '-Werror=undef') + sdl = declare_dependency(compile_args: '-Wno-undef', + dependencies: sdl, + version: sdl.version()) + endif sdl_image = dependency('SDL2_image', required: get_option('sdl_image'), method: 'pkg-config') else |