forked from 0ad/0ad
Remove Xcursor dependency following bbcd9b34cc
Fixes #5842 This was SVN commit r24304.
This commit is contained in:
parent
d719a66b43
commit
dcc73561c2
@ -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" },
|
||||
|
@ -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 \
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user