diff --git a/.gitignore b/.gitignore index 1cddda698a..8f94ea5004 100644 --- a/.gitignore +++ b/.gitignore @@ -41,9 +41,10 @@ thirdparty/Mono.Nat.dll thirdparty/Moq.dll thirdparty/nuget.exe thirdparty/windows/lua51.dll -thirdparty/windows/zlib1.dll thirdparty/windows/soft_oal.dll thirdparty/FuzzyLogicLibrary.dll +thirdparty/SDL2-CS.dll +thirdparty/Eluant.dll # backup files by various editors *~ diff --git a/Makefile b/Makefile index 604e31053d..3f5d97d132 100644 --- a/Makefile +++ b/Makefile @@ -286,6 +286,8 @@ all: cli-dependencies core tools clean: @-$(RM_F) *.exe *.dll ./OpenRA*/*.dll ./OpenRA*/*.mdb *.mdb mods/**/*.dll mods/**/*.mdb *.resources @-$(RM_RF) ./*/bin ./*/obj + @-$(RM_F) ./thirdparty/*.dll + @-$(RM_RF) ./thirdparty/windows distclean: clean diff --git a/make.ps1 b/make.ps1 index 41f4c6b7c0..a765ee7f10 100644 --- a/make.ps1 +++ b/make.ps1 @@ -71,8 +71,10 @@ elseif ($command -eq "clean") else { $proc = Start-Process $msBuild $msBuildArguments -NoNewWindow -PassThru -Wait - rm *.dll # delete third party dependencies + rm *.dll rm *.config + rm thirdparty/*.dll + rmdir thirdparty/windows/ rm mods/*/*.dll echo "Clean complete." } diff --git a/packaging/osx/buildpackage.sh b/packaging/osx/buildpackage.sh index 98ac5ef34d..102bdcae59 100755 --- a/packaging/osx/buildpackage.sh +++ b/packaging/osx/buildpackage.sh @@ -14,7 +14,7 @@ if [ -e "OpenRA.app" ]; then exit 2 fi -wget https://github.com/OpenRA/OpenRALauncherOSX/releases/download/${LAUNCHER_TAG}/launcher.zip || exit 3 +curl -s -L -O https://github.com/OpenRA/OpenRALauncherOSX/releases/download/${LAUNCHER_TAG}/launcher.zip || exit 3 unzip launcher.zip rm launcher.zip diff --git a/packaging/package-all.sh b/packaging/package-all.sh index 2c245a6e54..e5297df063 100755 --- a/packaging/package-all.sh +++ b/packaging/package-all.sh @@ -22,9 +22,9 @@ make package find . -path "*.mdb" -delete test -e Changelog.md && rm Changelog.md -wget https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md +curl -s -L -O https://raw.githubusercontent.com/wiki/OpenRA/OpenRA/Changelog.md -wget http://daringfireball.net/projects/downloads/Markdown_1.0.1.zip +curl -s -L -O http://daringfireball.net/projects/downloads/Markdown_1.0.1.zip unzip Markdown_1.0.1.zip rm -rf Markdown_1.0.1.zip ./Markdown_1.0.1/Markdown.pl Changelog.md > CHANGELOG.html diff --git a/thirdparty/Eluant.dll b/thirdparty/Eluant.dll deleted file mode 100644 index 2eef902457..0000000000 Binary files a/thirdparty/Eluant.dll and /dev/null differ diff --git a/thirdparty/README b/thirdparty/README deleted file mode 100644 index cd5c102446..0000000000 --- a/thirdparty/README +++ /dev/null @@ -1,11 +0,0 @@ -The DLLs in this directory are sourced from: - -Eluant.dll - https://github.com/pchote/Eluant/ - Commit 483f326bd071024f58dc7917da81e31ef680e85e - MIT license - -SDL2-CS.dll - https://github.com/flibitijibibo/SDL2-CS/ - Commit e8731efadb249a40f46d646e2b783ec588326ea6 - zlib license diff --git a/thirdparty/SDL2-CS.dll b/thirdparty/SDL2-CS.dll deleted file mode 100644 index f0862452d7..0000000000 Binary files a/thirdparty/SDL2-CS.dll and /dev/null differ diff --git a/thirdparty/fetch-thirdparty-deps.ps1 b/thirdparty/fetch-thirdparty-deps.ps1 index 0f9eff630a..e0531c83bb 100644 --- a/thirdparty/fetch-thirdparty-deps.ps1 +++ b/thirdparty/fetch-thirdparty-deps.ps1 @@ -121,3 +121,17 @@ if (!(Test-Path "FuzzyLogicLibrary.dll")) cp FuzzyLogicLibrary/bin/Release/FuzzyLogicLibrary.dll . rmdir FuzzyLogicLibrary -Recurse } + +if (!(Test-Path "SDL2-CS.dll")) +{ + echo "Fetching SDL2 C# from GitHub." + $target = Join-Path $pwd.ToString() "SDL2-CS.dll" + (New-Object System.Net.WebClient).DownloadFile("https://github.com/OpenRA/SDL2-CS/releases/download/20140407/SDL2-CS.dll", $target) +} + +if (!(Test-Path "Eluant.dll")) +{ + echo "Fetching Eluant from GitHub." + $target = Join-Path $pwd.ToString() "Eluant.dll" + (New-Object System.Net.WebClient).DownloadFile("https://github.com/OpenRA/Eluant/releases/download/20140425/Eluant.dll", $target) +} diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh index 639f6688dd..acf263d699 100755 --- a/thirdparty/fetch-thirdparty-deps.sh +++ b/thirdparty/fetch-thirdparty-deps.sh @@ -72,3 +72,13 @@ if [ ! -f FuzzyLogicLibrary.dll ]; then cp ./FuzzyLogicLibrary/bin/Release/FuzzyLogicLibrary.dll . rm -rf FuzzyLogicLibrary fi + +if [ ! -f SDL2-CS.dll ]; then + echo "Fetching SDL2-CS from GitHub." + curl -s -L -O https://github.com/OpenRA/SDL2-CS/releases/download/20140407/SDL2-CS.dll +fi + +if [ ! -f Eluant.dll ]; then + echo "Fetching Eluant from GitHub." + curl -s -L -O https://github.com/OpenRA/Eluant/releases/download/20140425/Eluant.dll +fi