Fix some bam stuff

This commit is contained in:
def 2015-02-05 19:52:13 +01:00
parent 4deffb523b
commit d4c6141fa2

22
bam.lua
View file

@ -120,11 +120,11 @@ if family == "windows" then
table.insert(client_depends, CopyToDirectory(".", "other\\freetype\\lib32\\freetype.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\sdl\\lib32\\SDL.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\lib32\\libcurl.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\lib32\\libeay32.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\lib32\\libidn-11.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\lib32\\ssleay32.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\lib32\\zlib1.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\windows\\lib32\\libcurl.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\windows\\lib32\\libeay32.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\windows\\lib32\\libidn-11.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\windows\\lib32\\ssleay32.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\windows\\lib32\\zlib1.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\opus\\windows\\lib32\\libgcc_s_sjlj-1.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\opus\\windows\\lib32\\libogg-0.dll"))
@ -134,10 +134,10 @@ if family == "windows" then
table.insert(client_depends, CopyToDirectory(".", "other\\freetype\\lib64\\freetype.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\sdl\\lib64\\SDL.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\lib64\\libcurl.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\lib64\\libeay32.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\lib64\\ssleay32.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\lib64\\zlib1.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\windows\\lib64\\libcurl.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\windows\\lib64\\libeay32.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\windows\\lib64\\ssleay32.dll"))
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\windows\\lib64\\zlib1.dll"))
--table.insert(client_depends, CopyToDirectory(".", "other\\opus\\windows\\lib64\\libgcc_s_sjlj-1.dll"))
--table.insert(client_depends, CopyToDirectory(".", "other\\opus\\windows\\lib64\\libogg-0.dll"))
@ -218,6 +218,7 @@ function build(settings)
settings.link.frameworks:Add("Carbon")
settings.link.frameworks:Add("AppKit")
settings.link.libs:Add("dl")
settings.link.libs:Add("crypto")
else
settings.link.libs:Add("pthread")
settings.link.libs:Add("dl")
@ -274,6 +275,9 @@ function build(settings)
client_settings.link.frameworks:Add("Cocoa")
launcher_settings.link.frameworks:Add("Cocoa")
client_settings.link.libs:Add("crypto")
client_settings.link.libs:Add("ssl")
client_settings.link.libs:Add("opusfile")
client_settings.link.libs:Add("opus")
client_settings.link.libs:Add("ogg")