Skip to content

Commit

Permalink
package/ci: build FreeType on at least one Windows target.
Browse files Browse the repository at this point in the history
To avoid future breakages like the one that got temporarily hotfixed in
1d4adde.
  • Loading branch information
mosra committed Nov 17, 2020
1 parent c26b78b commit 37a1866
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
2 changes: 1 addition & 1 deletion package/ci/appveyor-desktop.bat
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ cmake .. ^
-DWITH_DRFLACAUDIOIMPORTER=ON ^
-DWITH_DRMP3AUDIOIMPORTER=ON ^
-DWITH_DRWAVAUDIOIMPORTER=ON ^
-DWITH_FREETYPEFONT=OFF ^
-DWITH_FREETYPEFONT=%ONLY_ON_MSVC2019% ^
-DWITH_GLSLANGSHADERCONVERTER=%ONLY_ON_MSVC2019% ^
-DWITH_HARFBUZZFONT=OFF ^
-DWITH_ICOIMPORTER=ON ^
Expand Down
4 changes: 4 additions & 0 deletions package/ci/appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ install:
- IF NOT "%TARGET%" == "rt" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\DevIL-SDK-x64-1.7.8.zip appveyor DownloadFile http://downloads.sourceforge.net/openil/DevIL-SDK-x64-1.7.8.zip
- IF NOT "%TARGET%" == "rt" mkdir devil && cd devil && 7z x ..\DevIL-SDK-x64-1.7.8.zip && mkdir lib && move unicode\*.lib lib\ && cd ..

# FreeType, for MSVC 2019 and clang-cl only
- IF "%TARGET%" == "desktop" IF "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2019" IF "%COMPILER:~0,4%" == "msvc" IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\freetype-2.10.4-windows-2019.zip appveyor DownloadFile https://ci.magnum.graphics/freetype-2.10.4-windows-2019.zip
- IF "%TARGET%" == "desktop" IF "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2019" IF "%COMPILER:~0,4%" == "msvc" 7z x freetype-2.10.4-windows-2019.zip -o%APPVEYOR_BUILD_FOLDER%\deps

# Basis Universal
- set BASIS_VERSION=8565af680d1bd2ad56ab227ca7d96c56dfbe93ed
- IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\basis_universal-%BASIS_VERSION%.zip appveyor DownloadFile https://github.com/BinomialLLC/basis_universal/archive/%BASIS_VERSION%.zip
Expand Down

0 comments on commit 37a1866

Please sign in to comment.