From 5fe26071b97beb80b42fca737139857443a3d61b Mon Sep 17 00:00:00 2001 From: Wohlstand Date: Sat, 3 Jun 2023 01:01:06 +0300 Subject: [PATCH] AppVeyor: Tweaked the build Attempt to fix the broken build --- .appveyor.yml | 30 +++++++++++++++++++++++------- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index 19f53c8..ad428f6 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -14,12 +14,12 @@ environment: EXTRA_CMAKE_FLAGS: "-DMIXERX_ENABLE_GPL=ON -DBUILD_AS_VB6_BINDING=ON -DAUDIO_CODECS_BUILD_LOCAL_SDL2_SHARED=OFF -DAUDIO_CODECS_SDL2_GIT_BRANCH=237348c -DWITH_SDL2_WASAPI=OFF" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" - - NAME: MinGW-w64-i686-VB6-SDL.2.0.12-MinSizeRel + - NAME: MinGW-w64-i686-VB6-SDL.2.0.22-MinSizeRel BUILD_TYPE: MinSizeRel COMPILER: MinGW-w32 COMPILER_FAMILY: MinGW GENERATOR: "MinGW Makefiles" - PLATFORM: Win32-VB6-Binding-SDL-2.0.12 + PLATFORM: Win32-VB6-Binding-SDL-2.0.22 IS_VB6_BINDING: YES EXTRA_CMAKE_FLAGS: "-DMIXERX_ENABLE_GPL=ON -DBUILD_AS_VB6_BINDING=ON -DAUDIO_CODECS_BUILD_LOCAL_SDL2_SHARED=OFF -DAUDIO_CODECS_SDL2_GIT_BRANCH=237348c -DWITH_SDL2_WASAPI=OFF" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" @@ -34,15 +34,15 @@ environment: # EXTRA_CMAKE_FLAGS: "-DBUILD_AS_VB6_BINDING=ON -DAUDIO_CODECS_BUILD_LOCAL_SDL2_SHARED=OFF -DAUDIO_CODECS_SDL2_GIT_BRANCH=e9fc66a -DWITH_SDL2_WASAPI=OFF" # APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" - - NAME: MSVC15-i686-SDL.2.0.12-NOWASAPI-Release + - NAME: MSVC15-i686-SDL.2.0.22-NOWASAPI-Release BUILD_TYPE: Release COMPILER: MSVC15 COMPILER_FAMILY: MSVC GENERATOR: "Visual Studio 14 2015" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" - PLATFORM: Win32-SDL-2.0.12-DS + PLATFORM: Win32-SDL-2.0.22-DS PLATFORMTOOLSET: "v140_xp" - EXTRA_CMAKE_FLAGS: "-DMIXERX_ENABLE_GPL=ON -DAUDIO_CODECS_SDL2_GIT_BRANCH=983bbf9 -DWITH_SDL2_WASAPI=OFF" + EXTRA_CMAKE_FLAGS: "-DMIXERX_ENABLE_GPL=ON -DAUDIO_CODECS_SDL2_GIT_BRANCH=237348c -DWITH_SDL2_WASAPI=OFF" - NAME: MSVC15-i686-SDL.2.0.12-Release BUILD_TYPE: Release @@ -50,9 +50,9 @@ environment: COMPILER_FAMILY: MSVC GENERATOR: "Visual Studio 14 2015" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" - PLATFORM: Win32-SDL-2.0.12 + PLATFORM: Win32-SDL-2.0.22 PLATFORMTOOLSET: "v140_xp" - EXTRA_CMAKE_FLAGS: "-DMIXERX_ENABLE_GPL=ON -DAUDIO_CODECS_SDL2_GIT_BRANCH=983bbf9" + EXTRA_CMAKE_FLAGS: "-DMIXERX_ENABLE_GPL=ON -DAUDIO_CODECS_SDL2_GIT_BRANCH=237348c" # - NAME: MSVC15-i686-SDL.2.0.10-NOWASAPI-Release # BUILD_TYPE: Release @@ -101,6 +101,7 @@ environment: GENERATOR: "MinGW Makefiles" PLATFORM: Win32 APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" - NAME: MINGW-w64-i686-Default-Release BUILD_TYPE: Release @@ -109,6 +110,7 @@ environment: GENERATOR: "MinGW Makefiles" PLATFORM: Win32 APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" - NAME: MINGW-w64-x86_64-Default-Debug BUILD_TYPE: Debug @@ -117,6 +119,7 @@ environment: GENERATOR: "MinGW Makefiles" PLATFORM: x64 APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" - NAME: MINGW-w64-x86_64-Default-Release BUILD_TYPE: Release @@ -125,6 +128,7 @@ environment: GENERATOR: "MinGW Makefiles" PLATFORM: x64 APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" - NAME: MSVC15-x86_64-Default-Debug BUILD_TYPE: Debug @@ -132,6 +136,7 @@ environment: COMPILER_FAMILY: MSVC GENERATOR: "Visual Studio 14 2015 Win64" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" PLATFORM: x64 PLATFORMTOOLSET: "v140_xp" @@ -141,6 +146,7 @@ environment: COMPILER_FAMILY: MSVC GENERATOR: "Visual Studio 14 2015 Win64" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" PLATFORM: x64 PLATFORMTOOLSET: "v140_xp" @@ -150,6 +156,7 @@ environment: COMPILER_FAMILY: MSVC GENERATOR: "Visual Studio 14 2015" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" PLATFORM: Win32 PLATFORMTOOLSET: "v140_xp" @@ -159,6 +166,7 @@ environment: COMPILER_FAMILY: MSVC GENERATOR: "Visual Studio 14 2015" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" PLATFORM: Win32 PLATFORMTOOLSET: "v140_xp" @@ -168,6 +176,7 @@ environment: COMPILER_FAMILY: MSVC GENERATOR: "Visual Studio 15 2017 Win64" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" PLATFORM: x64 PLATFORMTOOLSET: "v141_xp" @@ -177,6 +186,7 @@ environment: COMPILER_FAMILY: MSVC GENERATOR: "Visual Studio 15 2017 Win64" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" PLATFORM: x64 PLATFORMTOOLSET: "v141_xp" @@ -186,6 +196,7 @@ environment: COMPILER_FAMILY: MSVC GENERATOR: "Visual Studio 15 2017" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" PLATFORM: Win32 PLATFORMTOOLSET: "v141_xp" @@ -195,6 +206,7 @@ environment: COMPILER_FAMILY: MSVC GENERATOR: "Visual Studio 15 2017" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" PLATFORM: Win32 PLATFORMTOOLSET: "v141_xp" @@ -204,6 +216,7 @@ environment: COMPILER_FAMILY: MSVC2 GENERATOR: "Visual Studio 16 2019" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" PLATFORM: x64 PLATFORMTOOLSET: "v142" @@ -213,6 +226,7 @@ environment: COMPILER_FAMILY: MSVC2 GENERATOR: "Visual Studio 16 2019" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" PLATFORM: x64 PLATFORMTOOLSET: "v142" @@ -222,6 +236,7 @@ environment: COMPILER_FAMILY: MSVC2 GENERATOR: "Visual Studio 16 2019" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" PLATFORM: Win32 PLATFORMTOOLSET: "v142" @@ -231,6 +246,7 @@ environment: COMPILER_FAMILY: MSVC2 GENERATOR: "Visual Studio 16 2019" APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019" + EXTRA_CMAKE_FLAGS: "-DAUDIO_CODECS_SDL2_GIT_BRANCH=SDL2" PLATFORM: Win32 PLATFORMTOOLSET: "v142"