Update SDL2-CS dependency.
This commit is contained in:
1
Makefile
1
Makefile
@@ -330,7 +330,6 @@ cli-dependencies:
|
||||
@./thirdparty/fetch-thirdparty-deps.sh
|
||||
@ $(CP_R) thirdparty/download/*.dll .
|
||||
@ $(CP_R) thirdparty/download/*.dll.config .
|
||||
@ $(CP) thirdparty/SDL2-CS.dll.config .
|
||||
|
||||
linux-dependencies: cli-dependencies linux-native-dependencies
|
||||
|
||||
|
||||
@@ -53,7 +53,6 @@ cp thirdparty/download/SharpFont* packaging/built
|
||||
|
||||
# SDL2-CS
|
||||
cp thirdparty/download/SDL2-CS* packaging/built
|
||||
cp thirdparty/SDL2-CS* packaging/built
|
||||
|
||||
# OpenAL-CS
|
||||
cp thirdparty/download/OpenAL-CS* packaging/built
|
||||
|
||||
18
thirdparty/SDL2-CS.dll.config
vendored
18
thirdparty/SDL2-CS.dll.config
vendored
@@ -1,18 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<configuration>
|
||||
<dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
|
||||
<dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0" />
|
||||
|
||||
<dllmap dll="soft_oal.dll" os="osx" target="/System/Library/Frameworks/OpenAL.framework/OpenAL"/>
|
||||
<dllmap dll="soft_oal.dll" os="linux" target="libopenal.so.1"/>
|
||||
|
||||
<dllmap dll="opengl32.dll">
|
||||
<dllentry os="linux" dll="libGL.so.1" />
|
||||
<dllentry os="osx" dll="/System/Library/Frameworks/OpenGL.framework/OpenGL" />
|
||||
</dllmap>
|
||||
|
||||
<dllmap dll="glu32.dll">
|
||||
<dllentry os="linux" dll="libGLU.so.1" />
|
||||
<dllentry os="osx" dll="/System/Library/Frameworks/OpenGL.framework/Libraries/libGLU.dylib" />
|
||||
</dllmap>
|
||||
</configuration>
|
||||
4
thirdparty/fetch-thirdparty-deps.ps1
vendored
4
thirdparty/fetch-thirdparty-deps.ps1
vendored
@@ -118,9 +118,9 @@ if (!(Test-Path "FuzzyLogicLibrary.dll"))
|
||||
|
||||
if (!(Test-Path "SDL2-CS.dll"))
|
||||
{
|
||||
echo "Fetching SDL2 C# from GitHub."
|
||||
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/20150709/SDL2-CS.dll", $target)
|
||||
(New-Object System.Net.WebClient).DownloadFile("https://github.com/OpenRA/SDL2-CS/releases/download/20151227/SDL2-CS.dll", $target)
|
||||
}
|
||||
|
||||
if (!(Test-Path "OpenAL-CS.dll"))
|
||||
|
||||
5
thirdparty/fetch-thirdparty-deps.sh
vendored
5
thirdparty/fetch-thirdparty-deps.sh
vendored
@@ -102,9 +102,10 @@ if [ ! -f FuzzyLogicLibrary.dll ]; then
|
||||
rm -rf FuzzyLogicLibrary
|
||||
fi
|
||||
|
||||
if [ ! -f SDL2-CS.dll ]; then
|
||||
if [ ! -f SDL2-CS.dll -o ! -f SDL2-CS.dll.config ]; then
|
||||
echo "Fetching SDL2-CS from GitHub."
|
||||
curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20150709/SDL2-CS.dll
|
||||
curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20151227/SDL2-CS.dll
|
||||
curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20151227/SDL2-CS.dll.config
|
||||
fi
|
||||
|
||||
if [ ! -f OpenAL-CS.dll -o ! -f OpenAL-CS.dll.config ]; then
|
||||
|
||||
Reference in New Issue
Block a user