diff --git a/binaries/data/mods/public/gui/credits/texts/programming.json b/binaries/data/mods/public/gui/credits/texts/programming.json index f4d43dd5b0..ceb918820d 100644 --- a/binaries/data/mods/public/gui/credits/texts/programming.json +++ b/binaries/data/mods/public/gui/credits/texts/programming.json @@ -33,6 +33,7 @@ { "name": "André Puel" }, { "nick": "andy5995", "name": "Andy Alt" }, { "nick": "Angen" }, + { "nick": "Arfrever", "name": "Arfrever Frehtes Taifersar Arahesis" }, { "nick": "ArnH", "name": "Arno Hemelhof" }, { "nick": "Aurium", "name": "Aurélio Heckert" }, { "nick": "badmadblacksad", "name": "Martin F" }, diff --git a/build/jenkins/dockerfiles/gcc6.Dockerfile b/build/jenkins/dockerfiles/gcc6.Dockerfile index cf9960aa85..b72bb4f04a 100644 --- a/build/jenkins/dockerfiles/gcc6.Dockerfile +++ b/build/jenkins/dockerfiles/gcc6.Dockerfile @@ -6,8 +6,8 @@ RUN apt-get -qq update && apt-get -qq upgrade RUN apt-get install -qqy cmake libcurl4-gnutls-dev libenet-dev \ libgnutls28-dev libgtk-3-dev libicu-dev libidn11-dev libjson-perl \ libminiupnpc-dev libnspr4-dev libpython-dev libogg-dev \ - libopenal-dev libpng-dev libsdl2-dev libvorbis-dev libxcursor-dev \ - libxml2-dev libxml-simple-perl subversion zlib1g-dev + libopenal-dev libpng-dev libsdl2-dev libvorbis-dev libxml2-dev \ + libxml-simple-perl subversion zlib1g-dev ADD libsodium-1.0.17.tar.gz /root/libsodium/ RUN cd /root/libsodium/libsodium-1.0.17 \ diff --git a/build/premake/extern_libs5.lua b/build/premake/extern_libs5.lua index cd7292f746..588ce9b7c2 100644 --- a/build/premake/extern_libs5.lua +++ b/build/premake/extern_libs5.lua @@ -693,13 +693,6 @@ extern_lib_defs = { end end, }, - xcursor = { - link_settings = function() - add_default_links({ - unix_names = { "Xcursor" }, - }) - end, - }, zlib = { compile_settings = function() if os.istarget("windows") or os.istarget("macosx") then diff --git a/build/premake/premake5.lua b/build/premake/premake5.lua index 4c4142c953..fe27c0d5da 100644 --- a/build/premake/premake5.lua +++ b/build/premake/premake5.lua @@ -958,7 +958,6 @@ used_extern_libs = { if not os.istarget("windows") and not _OPTIONS["android"] and not os.istarget("macosx") then -- X11 should only be linked on *nix table.insert(used_extern_libs, "x11") - table.insert(used_extern_libs, "xcursor") end if not _OPTIONS["without-audio"] then