diff --git a/.appveyor.yml b/.appveyor.yml index 2e7fb6f..9ae30cf 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -38,7 +38,7 @@ for: install: - git submodule update --init --recursive - sudo pip3 install protobuf - - brew install qt@5 opus openssl@1.1 nasm sdl2 protobuf + - HOMEBREW_NO_AUTO_UPDATE=1 brew install qt@5 opus openssl@1.1 nasm sdl2 protobuf - scripts/build-ffmpeg.sh build_script: diff --git a/scripts/appveyor-win.sh b/scripts/appveyor-win.sh index d5c7d99..dacf9b3 100755 --- a/scripts/appveyor-win.sh +++ b/scripts/appveyor-win.sh @@ -30,13 +30,10 @@ ninja ninja install cd ../.. -wget https://mirror.firedaemon.com/OpenSSL/openssl-1.1.1s.zip && 7z x openssl-1.1.1s.zip +wget https://download.firedaemon.com/FireDaemon-OpenSSL/openssl-1.1.1s.zip && 7z x openssl-1.1.*.zip -# We need to avoid SDL Versions > 2.0.20 on Windows, since there's a problem with resampling using -# the WASAPI audio driver: https://github.com/libsdl-org/SDL/issues/6326 -# TODO: Update to the latest version once 2.26.0 is released with a fix -wget https://www.libsdl.org/release/SDL2-devel-2.0.20-VC.zip && 7z x SDL2-devel-2.0.20-VC.zip -export SDL_ROOT="$BUILD_ROOT/SDL2-2.0.20" +wget https://www.libsdl.org/release/SDL2-devel-2.26.2-VC.zip && 7z x SDL2-devel-2.26.2-VC.zip +export SDL_ROOT="$BUILD_ROOT/SDL2-2.26.2" export SDL_ROOT=${SDL_ROOT//[\\]//} echo "set(SDL2_INCLUDE_DIRS \"$SDL_ROOT/include\") set(SDL2_LIBRARIES \"$SDL_ROOT/lib/x64/SDL2.lib\") @@ -58,7 +55,7 @@ COPY_DLLS="$PWD/openssl-1.1/x64/bin/libcrypto-1_1-x64.dll $PWD/openssl-1.1/x64/b echo "-- Configure" # SDL version discovery doesn't work with 2.0.20, so we just remove the version check ¯\_(ツ)_/¯ -sed -i -e 's/find_package(SDL2 2.0.16 MODULE REQUIRED)/find_package(SDL2 MODULE REQUIRED)/g' gui/CMakeLists.txt +# sed -i -e 's/find_package(SDL2 2.0.16 MODULE REQUIRED)/find_package(SDL2 MODULE REQUIRED)/g' gui/CMakeLists.txt mkdir build && cd build