Skip to content

Commit

Permalink
Update SDL2-CS dependency.
Browse files Browse the repository at this point in the history
  • Loading branch information
pchote committed Dec 27, 2015
1 parent 9f41743 commit 9063bef
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 24 deletions.
1 change: 0 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
1 change: 0 additions & 1 deletion packaging/package-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 0 additions & 18 deletions thirdparty/SDL2-CS.dll.config

This file was deleted.

4 changes: 2 additions & 2 deletions thirdparty/fetch-thirdparty-deps.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand Down
5 changes: 3 additions & 2 deletions thirdparty/fetch-thirdparty-deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9063bef

Please sign in to comment.