aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDiego Nehab <diego.nehab@gmail.com>2016-04-12 09:29:46 -0300
committerDiego Nehab <diego.nehab@gmail.com>2016-04-12 09:29:46 -0300
commit6aa4f2bc333679b9adab3942a3dadce9fe357bcc (patch)
tree78bb43753b879dc789d80088ab9edcefe2db91e0
parente2acf378ea4140dc910bbb5329fa4a603e571c39 (diff)
parent6fa6462636d9eecf8561d5775baa43bdf1d06348 (diff)
downloadluasocket-6aa4f2bc333679b9adab3942a3dadce9fe357bcc.tar.gz
luasocket-6aa4f2bc333679b9adab3942a3dadce9fe357bcc.tar.bz2
luasocket-6aa4f2bc333679b9adab3942a3dadce9fe357bcc.zip
Merge pull request #167 from xspager/add_haiku_plat
Add the lib network to the linked libs if the platform is Haiku
-rw-r--r--luasocket-scm-0.rockspec6
1 files changed, 5 insertions, 1 deletions
diff --git a/luasocket-scm-0.rockspec b/luasocket-scm-0.rockspec
index 352a497..61bd645 100644
--- a/luasocket-scm-0.rockspec
+++ b/luasocket-scm-0.rockspec
@@ -69,8 +69,11 @@ local function make_plat(plat)
69 socket = "src/socket.lua", 69 socket = "src/socket.lua",
70 mime = "src/mime.lua" 70 mime = "src/mime.lua"
71 } 71 }
72 if plat == "unix" or plat == "macosx" then 72 if plat == "unix" or plat == "macosx" or plat == "haiku" then
73 modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c" 73 modules["socket.core"].sources[#modules["socket.core"].sources+1] = "src/usocket.c"
74 if plat == "haiku" then
75 modules["socket.core"].libraries = {"network"}
76 end
74 modules["socket.unix"] = { 77 modules["socket.unix"] = {
75 sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/unix.c" }, 78 sources = { "src/buffer.c", "src/auxiliar.c", "src/options.c", "src/timeout.c", "src/io.c", "src/usocket.c", "src/unix.c" },
76 defines = defines[plat], 79 defines = defines[plat],
@@ -94,6 +97,7 @@ build = {
94 platforms = { 97 platforms = {
95 unix = make_plat("unix"), 98 unix = make_plat("unix"),
96 macosx = make_plat("macosx"), 99 macosx = make_plat("macosx"),
100 haiku = make_plat("haiku"),
97 win32 = make_plat("win32"), 101 win32 = make_plat("win32"),
98 mingw32 = make_plat("mingw32") 102 mingw32 = make_plat("mingw32")
99 }, 103 },