diff --git a/package/ci/appveyor-rt.bat b/package/ci/appveyor-rt.bat index 9a7f6b224..d6d2d5202 100644 --- a/package/ci/appveyor-rt.bat +++ b/package/ci/appveyor-rt.bat @@ -2,16 +2,6 @@ if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" call "C:/Program File if "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" set GENERATOR=Visual Studio 15 2017 set PATH=%APPVEYOR_BUILD_FOLDER%\deps-native\bin;%PATH% -rem Build ANGLE. The repo is now just a README redirecting to googlesource. -rem I don't want to bother with this right now, so checking out last usable -rem version from 2017. TODO: fix when I can be bothered -git clone --depth 10 git://github.com/MSOpenTech/angle.git || exit /b -cd angle || exit /b -git checkout c61d0488abd9663e0d4d2450db7345baa2c0dfb6 || exit /b -cd winrt\10\src || exit /b -msbuild angle.sln /p:Configuration=Release || exit /b -cd ..\..\..\.. || exit /b - rem Build SDL appveyor DownloadFile https://www.libsdl.org/release/SDL2-2.0.4.zip || exit /b 7z x SDL2-2.0.4.zip || exit /b @@ -58,12 +48,6 @@ cmake .. ^ -DCMAKE_SYSTEM_VERSION=10.0 ^ -DCORRADE_RC_EXECUTABLE=%APPVEYOR_BUILD_FOLDER%/deps-native/bin/corrade-rc.exe ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DEGL_LIBRARY=%APPVEYOR_BUILD_FOLDER%/angle/winrt/10/src/Release_x64/lib/libEGL.lib ^ - -DEGL_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%/angle/include ^ - -DOPENGLES2_LIBRARY=%APPVEYOR_BUILD_FOLDER%/angle/winrt/10/src/Release_x64/lib/libGLESv2.lib ^ - -DOPENGLES2_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%/angle/include ^ - -DOPENGLES3_LIBRARY=%APPVEYOR_BUILD_FOLDER%/angle/winrt/10/src/Release_x64/lib/libGLESv2.lib ^ - -DOPENGLES3_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%/angle/include ^ -DSDL2_LIBRARY_RELEASE=%APPVEYOR_BUILD_FOLDER%/SDL/VisualC-WinRT/UWP_VS2015/X64/Release/SDL-UWP/SDL2.lib ^ -DSDL2_INCLUDE_DIR=%APPVEYOR_BUILD_FOLDER%/SDL/include ^ -DWITH_AUDIO=OFF ^ diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml index a5e1baf5f..5554b6d7b 100644 --- a/package/ci/appveyor.yml +++ b/package/ci/appveyor.yml @@ -124,6 +124,12 @@ install: - IF "%BUILD_APPLICATIONS%" == "YES" IF "%COMPILER:~0,4%" == "msvc" copy glfw\lib-vc2015\glfw3.dll deps\bin\ && copy glfw\lib-vc2015\glfw3dll.lib deps\lib\glfw3.lib - IF "%BUILD_APPLICATIONS%" == "YES" IF "%COMPILER%" == "mingw" copy glfw\lib-mingw-w64\glfw3.dll deps\bin\ && copy glfw\lib-mingw-w64\libglfw3dll.a deps\lib\libglfw3.a +# Angle for WinRT. Zip from https://github.com/mosra/magnum-ci/tree/angle and +# self-hosted because GH Actions would make it too simple for people if you +# could just download the artifacts directly, right? RIGHT? +- IF "%TARGET%" == "rt" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\angle-4134-windows-uwp.zip appveyor DownloadFile https://ci.magnum.graphics/angle-4134-windows-uwp.zip +- IF "%TARGET%" == "rt" 7z x angle-4134-windows-uwp.zip -o%APPVEYOR_BUILD_FOLDER%\deps + build_script: - IF "%TARGET%" == "desktop" IF "%COMPILER:~0,4%" == "msvc" call package\ci\appveyor-desktop.bat - IF "%TARGET%" == "desktop" IF "%COMPILER%" == "mingw" call package\ci\appveyor-desktop-mingw.bat