diff --git a/.gitignore b/.gitignore index 396ffdcf85..9a5b57f7c6 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,8 @@ thirdparty/ICSharpCode.SharpZipLib.dll* thirdparty/MaxMind* thirdparty/RestSharp* thirdparty/Newtonsoft.Json* +thirdparty/SharpFont* +thirdparty/windows/freetype6.dll # backup files by various editors *~ diff --git a/thirdparty/README b/thirdparty/README index 6d9306dfd5..3820b60d0a 100644 --- a/thirdparty/README +++ b/thirdparty/README @@ -24,8 +24,3 @@ SDL2-CS.dll https://github.com/flibitijibibo/SDL2-CS/ Commit e8731efadb249a40f46d646e2b783ec588326ea6 zlib license - -SharpFont.dll - https://github.com/Robmaister/SharpFont - Version 2.5.0.1 - MIT license diff --git a/thirdparty/SharpFont.dll b/thirdparty/SharpFont.dll deleted file mode 100644 index 02c740c0c3..0000000000 Binary files a/thirdparty/SharpFont.dll and /dev/null differ diff --git a/thirdparty/SharpFont.dll.config b/thirdparty/SharpFont.dll.config deleted file mode 100644 index 875a473fd3..0000000000 --- a/thirdparty/SharpFont.dll.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/thirdparty/fetch-thirdparty-deps.ps1 b/thirdparty/fetch-thirdparty-deps.ps1 index 6d4474112a..f9ad607d00 100644 --- a/thirdparty/fetch-thirdparty-deps.ps1 +++ b/thirdparty/fetch-thirdparty-deps.ps1 @@ -32,4 +32,14 @@ if (!(Test-Path "MaxMind.GeoIP2.dll")) rmdir Newtonsoft.Json.6.0.5 -Recurse cp RestSharp.105.0.0/lib/net4-client/RestSharp* . rmdir RestSharp.105.0.0 -Recurse +} + +if (!(Test-Path "SharpFont.dll")) +{ + echo "Fetching SharpFont from NuGet." + ./nuget.exe install SharpFont -Version 2.5.3 + cp SharpFont.2.5.3.0/lib/net20/SharpFont* . + cp SharpFont.2.5.3.0/Content/SharpFont.dll.config . + cp SharpFont.2.5.3.0/Content/freetype6.dll ./windows/ + rmdir SharpFont.2.5.3.0 -Recurse } \ No newline at end of file diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh index 1d09f7fe5f..d7857d3d1c 100755 --- a/thirdparty/fetch-thirdparty-deps.sh +++ b/thirdparty/fetch-thirdparty-deps.sh @@ -24,4 +24,13 @@ if [ ! -f MaxMind.GeoIP2.dll ]; then rm -rf Newtonsoft.Json.6.0.5 cp ./RestSharp.105.0.0/lib/net4-client/RestSharp* . rm -rf RestSharp.105.0.0 +fi + +if [ ! -f SharpFont.dll ]; then + echo "Fetching SharpFont from nuget" + nuget install SharpFont -Version 2.5.3 + cp ./SharpFont.2.5.3.0/lib/net20/SharpFont* . + cp ./SharpFont.2.5.3.0/Content/SharpFont.dll.config . + cp ./SharpFont.2.5.3.0/Content/freetype6.dll ./windows/ + rm -rf SharpFont.2.5.3.0 fi \ No newline at end of file diff --git a/thirdparty/windows/freetype6.dll b/thirdparty/windows/freetype6.dll deleted file mode 100644 index e35edc6bb0..0000000000 Binary files a/thirdparty/windows/freetype6.dll and /dev/null differ