From 4f99982ef1df4cb763b6770c533ef193db89aadc Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 2 Sep 2019 16:38:31 +0000 Subject: [PATCH] Extend Linux dllmap to other systems - Drop `os` in Eluant config as it's only used on Linux - Make generic to help BSDs and Solaris - Update OpenAL-CS and SDL2-CS to get the same Exception of type `System.DllNotFoundException`: lua51.dll TypeName=`` at (wrapper managed-to-native) Eluant.LuaApi.lua_newstate(Eluant.LuaRuntime/LuaAllocator,intptr) at Eluant.LuaRuntime..ctor () at Eluant.MemoryConstrainedLuaRuntime..ctor () at OpenRA.Scripting.ScriptContext..ctor (OpenRA.World world, OpenRA.Graphics.WorldRenderer worldRenderer, System.Collections.Generic.IEnumerable`1[T] scripts) at OpenRA.Mods.Common.Scripting.LuaScript.OpenRA.Traits.IWorldLoaded.WorldLoaded (OpenRA.World world, OpenRA.Graphics.WorldRenderer worldRenderer) at OpenRA.World.LoadComplete (OpenRA.Graphics.WorldRenderer wr) at OpenRA.Game.StartGame (System.String mapUID, OpenRA.WorldType type) at OpenRA.Game.LoadShellMap () at OpenRA.Mods.Common.LoadScreens.BlankLoadScreen.StartGame (OpenRA.Arguments args) at OpenRA.Game.InitializeMod (System.String mod, OpenRA.Arguments args) at OpenRA.Game.Initialize (OpenRA.Arguments args) at OpenRA.Game.InitializeAndRun (System.String[] args) at OpenRA.Program.Main (System.String[] args) --- .../OpenRA.Platforms.Default.dll.config | 4 ++-- thirdparty/Eluant.dll.config.in | 2 +- thirdparty/fetch-thirdparty-deps.ps1 | 4 ++-- thirdparty/fetch-thirdparty-deps.sh | 16 ++++++++-------- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/OpenRA.Platforms.Default/OpenRA.Platforms.Default.dll.config b/OpenRA.Platforms.Default/OpenRA.Platforms.Default.dll.config index 32a7cfd944..7f03455a06 100644 --- a/OpenRA.Platforms.Default/OpenRA.Platforms.Default.dll.config +++ b/OpenRA.Platforms.Default/OpenRA.Platforms.Default.dll.config @@ -1,6 +1,6 @@ - + + - diff --git a/thirdparty/Eluant.dll.config.in b/thirdparty/Eluant.dll.config.in index 6c00f329f4..e51cdb1fca 100644 --- a/thirdparty/Eluant.dll.config.in +++ b/thirdparty/Eluant.dll.config.in @@ -1,3 +1,3 @@ - + diff --git a/thirdparty/fetch-thirdparty-deps.ps1 b/thirdparty/fetch-thirdparty-deps.ps1 index 92119d9d5f..94bbacf004 100644 --- a/thirdparty/fetch-thirdparty-deps.ps1 +++ b/thirdparty/fetch-thirdparty-deps.ps1 @@ -117,14 +117,14 @@ if (!(Test-Path "SDL2-CS.dll")) { echo "Fetching SDL2-CS from GitHub." $target = Join-Path $pwd.ToString() "SDL2-CS.dll" - (New-Object System.Net.WebClient).DownloadFile("https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll", $target) + (New-Object System.Net.WebClient).DownloadFile("https://github.com/OpenRA/SDL2-CS/releases/download/20190907/SDL2-CS.dll", $target) } if (!(Test-Path "OpenAL-CS.dll")) { echo "Fetching OpenAL-CS from GitHub." $target = Join-Path $pwd.ToString() "OpenAL-CS.dll" - (New-Object System.Net.WebClient).DownloadFile("https://github.com/OpenRA/OpenAL-CS/releases/download/20180106/OpenAL-CS.dll", $target) + (New-Object System.Net.WebClient).DownloadFile("https://github.com/OpenRA/OpenAL-CS/releases/download/20190907/OpenAL-CS.dll", $target) } if (!(Test-Path "Eluant.dll")) diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh index a3381520d2..4b2f5e9c1d 100755 --- a/thirdparty/fetch-thirdparty-deps.sh +++ b/thirdparty/fetch-thirdparty-deps.sh @@ -60,22 +60,22 @@ fi if [ ! -f SDL2-CS.dll ] || [ ! -f SDL2-CS.dll.config ]; then echo "Fetching SDL2-CS from GitHub." if command -v curl >/dev/null 2>&1; then - curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll - curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll.config + curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20190907/SDL2-CS.dll + curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20190907/SDL2-CS.dll.config else - wget -cq https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll - wget -cq https://github.com/OpenRA/SDL2-CS/releases/download/20161223/SDL2-CS.dll.config + wget -cq https://github.com/OpenRA/SDL2-CS/releases/download/20190907/SDL2-CS.dll + wget -cq https://github.com/OpenRA/SDL2-CS/releases/download/20190907/SDL2-CS.dll.config fi fi if [ ! -f OpenAL-CS.dll ] || [ ! -f OpenAL-CS.dll.config ]; then echo "Fetching OpenAL-CS from GitHub." if command -v curl >/dev/null 2>&1; then - curl -s -L -O https://github.com/OpenRA/OpenAL-CS/releases/download/20180106/OpenAL-CS.dll - curl -s -L -O https://github.com/OpenRA/OpenAL-CS/releases/download/20180106/OpenAL-CS.dll.config + curl -s -L -O https://github.com/OpenRA/OpenAL-CS/releases/download/20190907/OpenAL-CS.dll + curl -s -L -O https://github.com/OpenRA/OpenAL-CS/releases/download/20190907/OpenAL-CS.dll.config else - wget -cq https://github.com/OpenRA/OpenAL-CS/releases/download/20180106/OpenAL-CS.dll - wget -cq https://github.com/OpenRA/OpenAL-CS/releases/download/20180106/OpenAL-CS.dll.config + wget -cq https://github.com/OpenRA/OpenAL-CS/releases/download/20190907/OpenAL-CS.dll + wget -cq https://github.com/OpenRA/OpenAL-CS/releases/download/20190907/OpenAL-CS.dll.config fi fi