diff --git a/AUTHORS b/AUTHORS index 5b845d8df6..89832c2abd 100644 --- a/AUTHORS +++ b/AUTHORS @@ -162,9 +162,6 @@ the Apache 2.0 license. Using GeoLite2 data created by MaxMind and distributed under the CC BY-SA 3.0 license. -Using SharpFont created by Robert Rouhani and -distributed under the MIT license. - Using SDL2-CS and OpenAL-CS created by Ethan Lee and released under the zlib license. diff --git a/Makefile b/Makefile index dae4fd292b..380b9e0c79 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ pdefault_SRCS := $(shell find OpenRA.Platforms.Default/ -iname '*.cs') pdefault_TARGET = OpenRA.Platforms.Default.dll pdefault_KIND = library pdefault_DEPS = $(game_TARGET) -pdefault_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll thirdparty/download/OpenAL-CS.dll thirdparty/download/SharpFont.dll $(pdefault_DEPS) +pdefault_LIBS = $(COMMON_LIBS) thirdparty/download/SDL2-CS.dll thirdparty/download/OpenAL-CS.dll $(pdefault_DEPS) PROGRAMS += pdefault platforms: $(pdefault_TARGET) @@ -355,8 +355,7 @@ install-engine: @$(CP) Eluant* "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) ICSharpCode.SharpZipLib.dll "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) FuzzyLogicLibrary.dll "$(DATA_INSTALL_DIR)" - @$(INSTALL_PROGRAM) SharpFont.dll "$(DATA_INSTALL_DIR)" - @$(CP) SharpFont.dll.config "$(DATA_INSTALL_DIR)" + @$(CP) OpenRA.Platforms.Default.dll.config "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) Open.Nat.dll "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) MaxMind.Db.dll "$(DATA_INSTALL_DIR)" @$(INSTALL_PROGRAM) rix0rrr.BeaconLib.dll "$(DATA_INSTALL_DIR)" diff --git a/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj b/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj index 8a83c05ce9..5d5f046c1b 100644 --- a/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj +++ b/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj @@ -33,11 +33,6 @@ - - False - ..\thirdparty\download\SharpFont.dll - False - ..\thirdparty\download\Eluant.dll diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 95cf66b366..27d6936d20 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -115,7 +115,6 @@ Section "Game" GAME File "${SRCDIR}\RedAlert.ico" File "${SRCDIR}\TiberianDawn.ico" File "${SRCDIR}\Dune2000.ico" - File "${SRCDIR}\SharpFont.dll" File "${SRCDIR}\SDL2-CS.dll" File "${SRCDIR}\OpenAL-CS.dll" File "${SRCDIR}\global mix database.dat" @@ -229,7 +228,6 @@ Function ${UN}Clean Delete $INSTDIR\ICSharpCode.SharpZipLib.dll Delete $INSTDIR\FuzzyLogicLibrary.dll Delete $INSTDIR\Open.Nat.dll - Delete $INSTDIR\SharpFont.dll Delete $INSTDIR\VERSION Delete $INSTDIR\AUTHORS Delete $INSTDIR\COPYING diff --git a/thirdparty/fetch-thirdparty-deps.ps1 b/thirdparty/fetch-thirdparty-deps.ps1 index c44755bd70..b00eec957b 100644 --- a/thirdparty/fetch-thirdparty-deps.ps1 +++ b/thirdparty/fetch-thirdparty-deps.ps1 @@ -43,16 +43,6 @@ if (!(Test-Path "MaxMind.Db.dll")) rmdir MaxMind.Db -Recurse } -if (!(Test-Path "SharpFont.dll")) -{ - echo "Fetching SharpFont from NuGet." - ./nuget.exe install SharpFont -Version 4.0.1 -ExcludeVersion -Verbosity quiet -Source nuget.org - cp SharpFont/lib/net45/SharpFont* . - cp SharpFont/config/SharpFont.dll.config . - rmdir SharpFont -Recurse - rmdir SharpFont.Dependencies -Recurse -} - if (!(Test-Path "nunit.framework.dll")) { echo "Fetching NUnit from NuGet." diff --git a/thirdparty/fetch-thirdparty-deps.sh b/thirdparty/fetch-thirdparty-deps.sh index 55f7e8c9c2..d97214439d 100755 --- a/thirdparty/fetch-thirdparty-deps.sh +++ b/thirdparty/fetch-thirdparty-deps.sh @@ -41,14 +41,6 @@ if [ ! -f MaxMind.Db.dll ]; then rm -rf MaxMind.Db fi -if [ ! -f SharpFont.dll ]; then - echo "Fetching SharpFont from NuGet" - ../noget.sh SharpFont 4.0.1 - cp ./SharpFont/lib/net45/SharpFont* . - cp ./SharpFont/config/SharpFont.dll.config . - rm -rf SharpFont SharpFont.Dependencies -fi - if [ ! -f nunit.framework.dll ]; then echo "Fetching NUnit from NuGet" ../noget.sh NUnit 3.0.1