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

Merge pull request #7611 from Mailaender/freetype2-msvc-downgrade

Browse Source 
Fixed FreeType2 depending on too new VS C++ runtime DLLs
This commit is contained in:
Pavel Penev
2015-03-08 02:27:14 +02:00
parent 04fff1da72 0f309c31be
commit 4c394d61e4
2 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,10 +15,11 @@ if [ ! -f windows/SDL2.dll ]; then
fi fi
if [ ! -f windows/freetype6.dll ]; then if [ ! -f windows/freetype6.dll ]; then
echo "Fetching SharpFont from nuget" echo "Fetching FreeType2 from nuget"
nuget install SharpFont -Version 2.5.0.1 nuget install freetype2.redist -Version 2.4.11.3
cp ./SharpFont.2.5.0.1/Content/freetype6.dll ./windows/ cp ./freetype2.redist.2.4.11.3/bin/win32/zlib1.dll ./windows/
rm -rf SharpFont.2.5.0.1 cp ./freetype2.redist.2.4.11.3/bin/win32/freetype6.dll ./windows/
rm -rf freetype2.redist.2.4.11.3
fi fi
if [ ! -f windows/lua51.dll ]; then if [ ! -f windows/lua51.dll ]; then
@@ -30,9 +31,9 @@ fi
if [ ! -f windows/zlib1.dll ]; then if [ ! -f windows/zlib1.dll ]; then
echo "Fetching ZLib from nuget" echo "Fetching ZLib from nuget"
nuget install zlib.redist -Version 1.2.8.7 nuget install freetype2.redist -Version 2.4.11.3
cp ./zlib.redist.1.2.8.7/build/native/bin/v120/Win32/Release/dynamic/stdcall/zlib.dll windows/zlib1.dll cp ./freetype2.redist.2.4.11.3/bin/win32/zlib1.dll ./windows/
rm -rf zlib.redist.1.2.8.7 rm -rf freetype2.redist.2.4.11.3
fi fi
if [ ! -f windows/soft_oal.dll ]; then if [ ! -f windows/soft_oal.dll ]; then

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

@@ -53,7 +53,6 @@ if (!(Test-Path "SharpFont.dll"))
./nuget.exe install SharpFont -Version 2.5.0.1 ./nuget.exe install SharpFont -Version 2.5.0.1
cp SharpFont.2.5.0.1/lib/net20/SharpFont* . cp SharpFont.2.5.0.1/lib/net20/SharpFont* .
cp SharpFont.2.5.0.1/Content/SharpFont.dll.config . cp SharpFont.2.5.0.1/Content/SharpFont.dll.config .
cp SharpFont.2.5.0.1/Content/freetype6.dll ./windows/
rmdir SharpFont.2.5.0.1 -Recurse rmdir SharpFont.2.5.0.1 -Recurse
} }
@@ -90,12 +89,21 @@ if (!(Test-Path "windows/lua51.dll"))
rmdir lua51.redist.5.1.5 -Recurse rmdir lua51.redist.5.1.5 -Recurse
} }
if (!(Test-Path "windows/freetype6.dll"))
{
echo "Fetching FreeType2 from NuGet."
./nuget.exe install freetype2.redist -Version 2.4.11.3
cp freetype2.redist.2.4.11.3/bin/win32/zlib1.dll ./windows/zlib1.dll
cp freetype2.redist.2.4.11.3/bin/win32/freetype6.dll ./windows/freetype6.dll
rmdir freetype2.redist.2.4.11.3 -Recurse
}
if (!(Test-Path "windows/zlib1.dll")) if (!(Test-Path "windows/zlib1.dll"))
{ {
echo "Fetching ZLib from NuGet." echo "Fetching ZLib from NuGet."
./nuget.exe install zlib.redist -Version 1.2.8.7 ./nuget.exe install freetype2.redist -Version 2.4.11.3
cp zlib.redist.1.2.8.7/build/native/bin/v120/Win32/Release/dynamic/stdcall/zlib.dll windows/zlib1.dll cp freetype2.redist.2.4.11.3/bin/win32/zlib1.dll ./windows/zlib1.dll
rmdir zlib.redist.1.2.8.7 -Recurse rmdir freetype2.redist.2.4.11.3 -Recurse
} }
if (!(Test-Path "windows/soft_oal.dll")) if (!(Test-Path "windows/soft_oal.dll"))