edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Some systems want -ldl as the end, so let's do that

Browse source
This commit is contained in:
def 2015-09-23 16:32:33 +02:00
parent 05fcc58b2f
commit b3f094bf40
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
bam.lua
View file

@ -255,11 +255,9 @@ function build(settings)
if platform == "macosx" then if platform == "macosx" then
settings.link.frameworks:Add("Carbon") settings.link.frameworks:Add("Carbon")
settings.link.frameworks:Add("AppKit") settings.link.frameworks:Add("AppKit")
settings.link.libs:Add("dl")
settings.link.libs:Add("crypto") settings.link.libs:Add("crypto")
else else
settings.link.libs:Add("pthread") settings.link.libs:Add("pthread")
settings.link.libs:Add("dl")
settings.link.libs:Add("rt") settings.link.libs:Add("rt")
end end
@ -315,7 +313,6 @@ function build(settings)
client_settings.link.libs:Add("X11") client_settings.link.libs:Add("X11")
client_settings.link.libs:Add("GL") client_settings.link.libs:Add("GL")
client_settings.link.libs:Add("GLU") client_settings.link.libs:Add("GLU")
client_settings.link.libs:Add("dl")
end end
elseif family == "windows" then elseif family == "windows" then
@ -342,6 +339,13 @@ function build(settings)
config.opus:Apply(client_settings) config.opus:Apply(client_settings)
config.ogg:Apply(client_settings) config.ogg:Apply(client_settings)
if family == "unix" then
engine_settings.link.libs:Add("dl")
server_settings.link.libs:Add("dl")
client_settings.link.libs:Add("dl")
launcher_settings.link.libs:Add("dl")
end
engine = Compile(engine_settings, Collect("src/engine/shared/*.cpp", "src/base/*.c")) engine = Compile(engine_settings, Collect("src/engine/shared/*.cpp", "src/base/*.c"))
client = Compile(client_settings, Collect("src/engine/client/*.cpp")) client = Compile(client_settings, Collect("src/engine/client/*.cpp"))
server = Compile(server_settings, Collect("src/engine/server/*.cpp")) server = Compile(server_settings, Collect("src/engine/server/*.cpp"))