diff --git a/.appveyor.yml b/.appveyor.yml index 8d2cc6f97..303b9e6b7 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -62,6 +62,10 @@ environment: CMAKE_FLAGS: "-DWANT_DEBUG:BOOL=OFF -DWIN64:BOOL=ON" appveyor_build_worker_image: Visual Studio 2019 LIBJACK: libjack64.dll + OPENSSL_DIR: OpenSSL-Win64 + LIBSSL: libssl-1_1-x64.dll + LIBCRYPTO: libcrypto-1_1-x64.dll + CHOCO_ARCH: PROGRAM_FILES: "Program Files" @@ -73,6 +77,10 @@ environment: CMAKE_FLAGS: "-DWANT_DEBUG:BOOL=OFF -DWIN64:BOOL=OFF" appveyor_build_worker_image: Visual Studio 2019 LIBJACK: libjack.dll + OPENSSL_DIR: OpenSSL-Win32 + LIBSSL: libssl-1_1.dll + LIBCRYPTO: libcrypto-1_1.dll + CHOCO_ARCH: --x86 PROGRAM_FILES: "Program Files (x86)" @@ -284,6 +292,13 @@ for: dir "c:\%PROGRAM_FILES%\JACK2" dir "c:\%PROGRAM_FILES%\JACK2\lib" + REM *** Results are ignored since a dependency was not properly installed in 32 bit Windows. But the .dll files required are installed regardless, so we don't care.*** + + choco install %CHOCO_ARCH% -y openssl --version=1.1.1.1300 || cmd /c "exit /b 0" + + echo "C:\%OPENSSL_DIR%" + dir "C:\%OPENSSL_DIR%" + REM *** Install dependencies *** c:\msys64\usr\bin\pacman --noconfirm -S -q %MSYS_REPO%-libarchive c:\msys64\usr\bin\pacman --noconfirm -S -q %MSYS_REPO%-libsndfile @@ -340,6 +355,8 @@ for: REM copy_third_party_libs.py thinks it's a system lib and REM won't copy it. copy c:\Windows\%LIBJACK% %APPVEYOR_BUILD_FOLDER%\build\windows\extralibs + copy c:\%OPENSSL_DIR%\%LIBSSL% %APPVEYOR_BUILD_FOLDER%\build\windows\extralibs + copy c:\%OPENSSL_DIR%\%LIBCRYPTO% %APPVEYOR_BUILD_FOLDER%\build\windows\extralibs REM *** Build installer *** cpack -G NSIS -v