From d71587e39ba0d0c1541629a2cc8dce443de6581d Mon Sep 17 00:00:00 2001 From: Yu-Chen Lin Date: Sat, 22 Oct 2022 21:32:12 +0800 Subject: [PATCH] Avoid string concatenation in crossfiles This feature is not supported on older meson versions: ERROR: Malformed value in cross file variable prebuilt_libusb. Refs PR #3546 Signed-off-by: Yu-Chen Lin Signed-off-by: Romain Vimont --- cross_win32.txt | 2 +- cross_win64.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cross_win32.txt b/cross_win32.txt index d1d5d11b1d..1e1b5242d4 100644 --- a/cross_win32.txt +++ b/cross_win32.txt @@ -22,4 +22,4 @@ ffmpeg_avutil = 'avutil-56' prebuilt_ffmpeg = 'ffmpeg-win32-4.3.1' prebuilt_sdl2 = 'SDL2-2.0.22/i686-w64-mingw32' prebuilt_libusb_root = 'libusb-1.0.26' -prebuilt_libusb = prebuilt_libusb_root + '/MinGW-Win32' +prebuilt_libusb = 'libusb-1.0.26/MinGW-Win32' diff --git a/cross_win64.txt b/cross_win64.txt index cc9e4a0bbf..f952dec230 100644 --- a/cross_win64.txt +++ b/cross_win64.txt @@ -22,4 +22,4 @@ ffmpeg_avutil = 'avutil-57' prebuilt_ffmpeg = 'ffmpeg-win64-5.0.1' prebuilt_sdl2 = 'SDL2-2.0.22/x86_64-w64-mingw32' prebuilt_libusb_root = 'libusb-1.0.26' -prebuilt_libusb = prebuilt_libusb_root + '/MinGW-x64' +prebuilt_libusb = 'libusb-1.0.26/MinGW-x64'