mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-19 17:14:18 +00:00
Further build fixes
This commit is contained in:
parent
b1b4aa78ea
commit
ed3b3f94c4
4
bam.lua
4
bam.lua
|
@ -145,7 +145,7 @@ if family == "windows" then
|
|||
table.insert(client_depends, CopyToDirectory(".", "other/freetype/lib32/freetype.dll"))
|
||||
table.insert(client_depends, CopyToDirectory(".", "other/sdl/lib32/SDL2.dll"))
|
||||
|
||||
table.insert(client_depends, CopyToDirectory(".", "other/curl/windows/lib32/libcurl.dll"))
|
||||
table.insert(client_depends, CopyToDirectory(".", "other/curl/windows/lib32/libcurl-4.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"))
|
||||
|
@ -160,7 +160,7 @@ if family == "windows" then
|
|||
table.insert(client_depends, CopyToDirectory(".", "other/freetype/lib64/freetype.dll"))
|
||||
table.insert(client_depends, CopyToDirectory(".", "other/sdl/lib64/SDL2.dll"))
|
||||
|
||||
table.insert(client_depends, CopyToDirectory(".", "other/curl/windows/lib64/libcurl.dll"))
|
||||
table.insert(client_depends, CopyToDirectory(".", "other/curl/windows/lib64/libcurl-4.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"))
|
||||
|
|
|
@ -45,7 +45,9 @@ Curl = {
|
|||
else
|
||||
settings.cc.includes:Add(Curl.basepath .. "/include")
|
||||
|
||||
if family ~= "windows" then
|
||||
if platform == "macosx" then
|
||||
settings.link.libs:Add("curl")
|
||||
elseif family ~= "windows" then
|
||||
settings.link.libs:Add("curl")
|
||||
settings.link.libs:Add("ssl")
|
||||
settings.link.libs:Add("crypto")
|
||||
|
|
|
@ -81,7 +81,7 @@ if include_data and not use_bundle:
|
|||
shutil.copy("libopusfile-0.dll", package_dir)
|
||||
#shutil.copy("libmysql.dll", package_dir)
|
||||
#shutil.copy("mysqlcppconn.dll", package_dir)
|
||||
shutil.copy("libcurl.dll", package_dir)
|
||||
shutil.copy("libcurl-4.dll", package_dir)
|
||||
#shutil.copy("libeay32.dll", package_dir)
|
||||
#shutil.copy("ssleay32.dll", package_dir)
|
||||
#shutil.copy("zlib1.dll", package_dir)
|
||||
|
|
Loading…
Reference in a new issue