From 457b8a996d1410dce79c75e78d3cb72a3d1b8a82 Mon Sep 17 00:00:00 2001 From: derselbst Date: Sat, 1 Feb 2025 22:43:10 +0100 Subject: [PATCH] Fix Windows CI with SDL3 on x86 and with MinGW --- .azure/azure-pipelines-win.yml | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/.azure/azure-pipelines-win.yml b/.azure/azure-pipelines-win.yml index a12cb55a8..514ab29a5 100644 --- a/.azure/azure-pipelines-win.yml +++ b/.azure/azure-pipelines-win.yml @@ -17,8 +17,7 @@ trigger: - 'README.md' variables: - sdl3-x86: 'https://github.com/libsdl-org/SDL/releases/download/release-3.2.0/SDL3-devel-3.2.0-mingw.zip' - sdl3-x64: 'https://github.com/libsdl-org/SDL/releases/download/release-3.2.0/SDL3-devel-3.2.0-VC.zip' + sdl3-url: 'https://github.com/libsdl-org/SDL/releases/download/release-3.2.0/SDL3-devel-3.2.0-VC.zip' jobs: - job: WindowsXP @@ -30,7 +29,6 @@ jobs: platform: Win32 gtk-bundle: $(gtk-bundle-x86) libsndfile-url: $(libsndfile-url-x86) - sdl3-url: $(sdl3-x86) artifact-prefix: "fluidsynth" CFLAGS: "/arch:IA32" CXXFLAGS: "/arch:IA32" @@ -39,7 +37,6 @@ jobs: platform: x64 gtk-bundle: $(gtk-bundle-x64) libsndfile-url: $(libsndfile-url-x64) - sdl3-url: $(sdl3-x64) artifact-prefix: "fluidsynth" CFLAGS: "" CXXFLAGS: "" @@ -68,8 +65,6 @@ jobs: 7z x -aos -- sdl3-dev.zip > NUL || exit -1 rm *.zip cd SDL3-* - cp -rf i686-w64-mingw32/* .. - rm -rf x86_64-w64-mingw32 i686-w64-mingw32 cp -rf * .. cd .. rm -rf SDL3-* @@ -229,11 +224,6 @@ jobs: 7z x -aos -- sdl3.zip > NUL || exit -1 rm *.zip cd SDL3-* - rm -rf i686* - cd x86_64* - cp -rf * ../.. - cd .. - rm -rf x86_64* cp -rf * .. cd .. rm -rf SDL3-*