From 0f9b87269e27d263c62d19952a49b45e9014621f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 7 Aug 2015 19:52:40 +0200 Subject: [PATCH] get latest FreeType6 for Windows downgrade dependency to MSVC++ 2008 --- thirdparty/fetch-thirdparty-deps-windows.sh | 4 ++-- thirdparty/fetch-thirdparty-deps.ps1 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/thirdparty/fetch-thirdparty-deps-windows.sh b/thirdparty/fetch-thirdparty-deps-windows.sh index 6358f9b622..ec54e4289b 100755 --- a/thirdparty/fetch-thirdparty-deps-windows.sh +++ b/thirdparty/fetch-thirdparty-deps-windows.sh @@ -26,8 +26,8 @@ fi if [ ! -f freetype6.dll ]; then echo "Fetching FreeType2 from NuGet" - get SharpFont.Dependencies 2.5.5.1 - cp ./SharpFont.Dependencies/bin/msvc10/x86/freetype6.dll . + get SharpFont.Dependencies 2.6.0 + cp ./SharpFont.Dependencies/bin/msvc9/x86/freetype6.dll . rm -rf SharpFont.Dependencies fi diff --git a/thirdparty/fetch-thirdparty-deps.ps1 b/thirdparty/fetch-thirdparty-deps.ps1 index 7ddcfa02fd..d97ae7512d 100644 --- a/thirdparty/fetch-thirdparty-deps.ps1 +++ b/thirdparty/fetch-thirdparty-deps.ps1 @@ -95,8 +95,8 @@ if (!(Test-Path "windows/lua51.dll")) if (!(Test-Path "windows/freetype6.dll")) { echo "Fetching FreeType2 from NuGet." - ./nuget.exe install SharpFont.Dependencies -Version 2.5.5.1 -ExcludeVersion - cp SharpFont.Dependencies/bin/msvc10/x86/freetype6.dll ./windows/freetype6.dll + ./nuget.exe install SharpFont.Dependencies -Version 2.6.0 -ExcludeVersion + cp SharpFont.Dependencies/bin/msvc9/x86/freetype6.dll ./windows/freetype6.dll rmdir SharpFont.Dependencies -Recurse }