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

Merge pull request #7579 from Mailaender/lua51-msvc110

Browse Source 
Avoid MSVC120 runtime dependency for Lua Windows DLLs
This commit is contained in:
Pavel Penev
2015-03-08 02:29:55 +02:00
parent 4c394d61e4 b7255761e3
commit 5ad1424c87
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,9 +24,9 @@ fi
if [ ! -f windows/lua51.dll ]; then if [ ! -f windows/lua51.dll ]; then
echo "Fetching Lua 5.1 from nuget" echo "Fetching Lua 5.1 from nuget"
nuget install lua51.redist -Version 5.1.5 nuget install lua.binaries -Version 5.1.5
cp ./lua51.redist.5.1.5/build/native/bin/Win32/v120/Release/lua5.1.dll ./windows/lua51.dll cp ./lua.binaries.5.1.5/bin/win32/dll8/lua5.1.dll ./windows/lua51.dll
rm -rf lua51.redist.5.1.5 rm -rf lua.binaries.5.1.5
fi fi
if [ ! -f windows/zlib1.dll ]; then if [ ! -f windows/zlib1.dll ]; then

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

@@ -84,9 +84,9 @@ if (!(Test-Path "Mono.Nat.dll"))
if (!(Test-Path "windows/lua51.dll")) if (!(Test-Path "windows/lua51.dll"))
{ {
echo "Fetching Lua 5.1 from NuGet." echo "Fetching Lua 5.1 from NuGet."
./nuget.exe install lua51.redist -Version 5.1.5 ./nuget.exe install lua.binaries -Version 5.1.5
cp lua51.redist.5.1.5/build/native/bin/Win32/v120/Release/lua5.1.dll ./windows/lua51.dll cp lua.binaries.5.1.5/bin/win32/dll8/lua5.1.dll ./windows/lua51.dll
rmdir lua51.redist.5.1.5 -Recurse rmdir lua.binaries.5.1.5 -Recurse
} }
if (!(Test-Path "windows/freetype6.dll")) if (!(Test-Path "windows/freetype6.dll"))