mirror of
https://github.com/ddnet/ddnet.git
synced 2024-11-10 10:08:18 +00:00
First try for Win64
This commit is contained in:
parent
52aa375397
commit
e503b7def5
17
bam.lua
17
bam.lua
|
@ -140,10 +140,10 @@ if family == "windows" then
|
||||||
table.insert(client_depends, CopyToDirectory(".", "other\\curl\\windows\\lib64\\ssleay32.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\\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\\libgcc_s_seh-1.dll"))
|
||||||
--table.insert(client_depends, CopyToDirectory(".", "other\\opus\\windows\\lib64\\libogg-0.dll"))
|
table.insert(client_depends, CopyToDirectory(".", "other\\opus\\windows\\lib64\\libogg-0.dll"))
|
||||||
--table.insert(client_depends, CopyToDirectory(".", "other\\opus\\windows\\lib64\\libopus-0.dll"))
|
table.insert(client_depends, CopyToDirectory(".", "other\\opus\\windows\\lib64\\libopus-0.dll"))
|
||||||
--table.insert(client_depends, CopyToDirectory(".", "other\\opus\\windows\\lib64\\libopusfile-0.dll"))
|
table.insert(client_depends, CopyToDirectory(".", "other\\opus\\windows\\lib64\\libopusfile-0.dll"))
|
||||||
end
|
end
|
||||||
table.insert(server_sql_depends, CopyToDirectory(".", "other\\mysql\\vc2005libs\\mysqlcppconn.dll"))
|
table.insert(server_sql_depends, CopyToDirectory(".", "other\\mysql\\vc2005libs\\mysqlcppconn.dll"))
|
||||||
table.insert(server_sql_depends, CopyToDirectory(".", "other\\mysql\\vc2005libs\\libmysql.dll"))
|
table.insert(server_sql_depends, CopyToDirectory(".", "other\\mysql\\vc2005libs\\libmysql.dll"))
|
||||||
|
@ -338,8 +338,13 @@ function build(settings)
|
||||||
end
|
end
|
||||||
|
|
||||||
elseif family == "windows" then
|
elseif family == "windows" then
|
||||||
client_settings.link.libpath:Add("other/opus/windows/lib32")
|
if arch == "amd64" then
|
||||||
client_settings.link.libpath:Add("other/curl/windows/lib32")
|
client_settings.link.libpath:Add("other/opus/windows/lib64")
|
||||||
|
client_settings.link.libpath:Add("other/curl/windows/lib64")
|
||||||
|
else
|
||||||
|
client_settings.link.libpath:Add("other/opus/windows/lib32")
|
||||||
|
client_settings.link.libpath:Add("other/curl/windows/lib32")
|
||||||
|
end
|
||||||
client_settings.link.libs:Add("opengl32")
|
client_settings.link.libs:Add("opengl32")
|
||||||
client_settings.link.libs:Add("glu32")
|
client_settings.link.libs:Add("glu32")
|
||||||
client_settings.link.libs:Add("winmm")
|
client_settings.link.libs:Add("winmm")
|
||||||
|
|
BIN
other/opus/windows/lib64/libgcc_s_seh-1.dll
Executable file
BIN
other/opus/windows/lib64/libgcc_s_seh-1.dll
Executable file
Binary file not shown.
BIN
other/opus/windows/lib64/libogg-0.dll
Executable file
BIN
other/opus/windows/lib64/libogg-0.dll
Executable file
Binary file not shown.
BIN
other/opus/windows/lib64/libopus-0.dll
Executable file
BIN
other/opus/windows/lib64/libopus-0.dll
Executable file
Binary file not shown.
BIN
other/opus/windows/lib64/libopusfile-0.dll
Executable file
BIN
other/opus/windows/lib64/libopusfile-0.dll
Executable file
Binary file not shown.
Loading…
Reference in a new issue