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

Further build fixes

Browse source
This commit is contained in:
def 2017-07-17 00:34:11 +02:00
parent b1b4aa78ea
commit ed3b3f94c4
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bam.lua
View file

@ -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"))

4
other/curl/curl.lua
View file

@ -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")

2
scripts/make_release.py
View file

@ -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)