epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8983 from Mailaender/freetype260-mscv9

Browse Source 
Updated to latest FreeType6 version for Windows while downgrading the dependency to MSVC++ 2008
This commit is contained in:
Matthias Mailänder
2015-08-08 11:42:58 +02:00
parent f416dfaca3 e430f313a7
commit bc1a8d4b64
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
make.ps1
View File

@@ -125,13 +125,6 @@ elseif ($command -eq "dependencies")
cp download/windows/*.dll ..
cd ..
echo "Dependencies copied."
$dep = "Microsoft Visual C++ 201"
$results = Get-ItemProperty HKLM:\Software\Microsoft\Windows\CurrentVersion\Uninstall\* | select DisplayName | Where-Object {$_.DisplayName -like $("$dep*")}
if (!($results -is [array]) -and !$results.DisplayName)
{
Write-Host "Warning! Freetype6.dll requires Microsoft Visual C++ 2010 x86 Redistributable!" -Foreground "Red"
}
}
elseif ($command -eq "test")
{

4
thirdparty/fetch-thirdparty-deps-windows.sh vendored
View File

@@ -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

4
thirdparty/fetch-thirdparty-deps.ps1 vendored
View File

@@ -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
}