Changeset View
Changeset View
Standalone View
Standalone View
build/premake/extern_libs5.lua
Show First 20 Lines • Show All 387 Lines • ▼ Show 20 Lines | link_settings = function() | ||||
win_names = { "libpng16" }, | win_names = { "libpng16" }, | ||||
unix_names = { "png" }, | unix_names = { "png" }, | ||||
-- Otherwise ld will sometimes pull in ancient 1.2 from the SDK, which breaks the build :/ | -- Otherwise ld will sometimes pull in ancient 1.2 from the SDK, which breaks the build :/ | ||||
-- TODO: Figure out why that happens | -- TODO: Figure out why that happens | ||||
osx_names = { "png16" }, | osx_names = { "png16" }, | ||||
}) | }) | ||||
end, | end, | ||||
}, | }, | ||||
libsodium = { | |||||
Itms: Building libsodium on Windows is trivial, I documented it [[ https://trac.wildfiregames. | |||||
Done Inline ActionsSo no changes needed here? leper: So no changes needed here? | |||||
Done Inline ActionsI have libsodium = { compile_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_include_paths("libsodium") end end, link_settings = function() if os.istarget("windows") or os.istarget("macosx") then add_default_lib_paths("libsodium") end add_default_links({ win_names = { "libsodium" }, unix_names = { "sodium" }, }) end, }, which is just a copy-paste from other libs and probably less clever than using pkg-config for Unix. Itms: I have
```
libsodium = {
compile_settings = function()
if os.istarget("windows") or os. | |||||
compile_settings = function() | |||||
if os.istarget("windows") or os.istarget("macosx") then | |||||
add_default_include_paths("libsodium") | |||||
end | |||||
end, | |||||
link_settings = function() | |||||
if os.istarget("windows") or os.istarget("macosx") then | |||||
add_default_lib_paths("libsodium") | |||||
end | |||||
add_default_links({ | |||||
win_names = { "libsodium" }, | |||||
unix_names = { "sodium" }, | |||||
}) | |||||
end, | |||||
}, | |||||
libxml2 = { | libxml2 = { | ||||
compile_settings = function() | compile_settings = function() | ||||
if os.istarget("windows") then | if os.istarget("windows") then | ||||
add_default_include_paths("libxml2") | add_default_include_paths("libxml2") | ||||
elseif os.istarget("macosx") then | elseif os.istarget("macosx") then | ||||
-- Support XML2_CONFIG for overriding for the default PATH-based xml2-config | -- Support XML2_CONFIG for overriding for the default PATH-based xml2-config | ||||
xml2_config_path = os.getenv("XML2_CONFIG") | xml2_config_path = os.getenv("XML2_CONFIG") | ||||
if not xml2_config_path then | if not xml2_config_path then | ||||
▲ Show 20 Lines • Show All 310 Lines • Show Last 20 Lines |
Wildfire Games · Phabricator
Building libsodium on Windows is trivial, I documented it on Trac. Note that we also need to build cURL with SSL support. I vote for using WinSSL in order to avoid gnutls/openssl difficulties on Windows. WinSSL can also be used for gloox when we use SSL encryption on the lobby.