diff --git a/.gitignore b/.gitignore index 9945157b0e..4f26bae68f 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ thirdparty/SharpFont* thirdparty/windows/freetype6.dll thirdparty/nunit* thirdparty/windows/SDL2.dll +thirdparty/Mono.Nat.dll # backup files by various editors *~ diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index 6ab4068dc5..136743823f 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -53,7 +53,7 @@ ..\thirdparty\SharpFont.dll False - + False False mono.nat diff --git a/thirdparty/Mono.Nat.dll b/thirdparty/Mono.Nat.dll deleted file mode 100644 index a9b77a3a8a..0000000000 Binary files a/thirdparty/Mono.Nat.dll and /dev/null differ diff --git a/thirdparty/README b/thirdparty/README index ccb0663db8..099669595c 100644 --- a/thirdparty/README +++ b/thirdparty/README @@ -10,11 +10,6 @@ FuzzyLogicLibrary.dll Version 1.2.0 GPL v2.0 license -Mono.Nat.dll - http://projects.qnetp.net/projects/show/mono-nat - Version 1.1.0 - MIT license - SDL2-CS.dll https://github.com/flibitijibibo/SDL2-CS/ Commit e8731efadb249a40f46d646e2b783ec588326ea6 diff --git a/thirdparty/fetch-thirdparty-deps.ps1 b/thirdparty/fetch-thirdparty-deps.ps1 index 595f6254a1..9dfa7fef54 100644 --- a/thirdparty/fetch-thirdparty-deps.ps1 +++ b/thirdparty/fetch-thirdparty-deps.ps1 @@ -59,4 +59,12 @@ if (!(Test-Path "windows/SDL2.dll")) cp sdl2.redist.2.0.3/build/native/bin/Win32/dynamic/SDL2.dll ./windows/ rmdir sdl2.2.0.3 -Recurse rmdir sdl2.redist.2.0.3 -Recurse +} + +if (!(Test-Path "Mono.Nat.dll")) +{ + echo "Fetching Mono.Nat from NuGet." + ./nuget.exe install Mono.Nat -Version 1.2.21 + cp Mono.Nat.1.2.21.0/lib/net40/Mono.Nat.dll . + rmdir Mono.Nat.1.2.21.0 -Recurse } \ No newline at end of file diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh index 4dcfd26435..527148dfa5 100755 --- a/thirdparty/fetch-thirdparty-deps.sh +++ b/thirdparty/fetch-thirdparty-deps.sh @@ -47,4 +47,11 @@ if [ ! -f windows/SDL2.dll ]; then nuget install sdl2 -Version 2.0.3 cp ./sdl2.redist.2.0.3/build/native/bin/Win32/dynamic/SDL2.dll ./windows/ rm -rf sdl2.2.0.3 sdl2.redist.2.0.3 +fi + +if [ ! -f Mono.Nat.dll ]; then + echo "Fetching Mono.Nat from nuget" + nuget install Mono.Nat -Version 1.2.21 + cp ./Mono.Nat.1.2.21.0/lib/net40/Mono.Nat.dll . + rm -rf Mono.Nat.1.2.21.0 fi \ No newline at end of file