qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: [PATCH] meson.build: Use -Wno-undef only for SDL 2.0.8 and older


From: Thomas Huth
Subject: Re: [PATCH] meson.build: Use -Wno-undef only for SDL 2.0.8 and older
Date: Wed, 31 May 2023 17:34:19 +0200
User-agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0

On 31/05/2023 11.39, Thomas Huth wrote:
There is no need to disable this useful compiler warning for
newer versions of the SDL anymore.

This also enables the printing of the version number with
newer versions of the SDL in the summary of the meson output
again.

Signed-off-by: Thomas Huth <thuth@redhat.com>
---
  meson.build | 10 ++++++----
  1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/meson.build b/meson.build
index bc76ea96bf..8ccd928dca 100644
--- a/meson.build
+++ b/meson.build
@@ -1273,10 +1273,12 @@ 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())
+  if sdl.version().version_compare('<=2.0.8')
+    # work around 2.0.8 bug
+    sdl = declare_dependency(compile_args: '-Wno-undef',
+                             dependencies: sdl,
+                             version: sdl.version())
+  endif

Drat, never mind, this still fails with the SDL2 from MinGW:

 https://gitlab.com/thuth/qemu/-/jobs/4385862312#L3048

 Thomas





reply via email to

[Prev in Thread] Current Thread [Next in Thread]