diff --git a/CMakeLists.txt b/CMakeLists.txt index 0e8f50648..6b94011ba 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1479,6 +1479,12 @@ set(LOVE_SRC_3P_LUASOCKET_LIBLUASOCKET src/libraries/luasocket/libluasocket/udp.c src/libraries/luasocket/libluasocket/udp.h src/libraries/luasocket/libluasocket/url.lua.h + src/libraries/luasocket/libluasocket/unix.c + src/libraries/luasocket/libluasocket/unix.h + src/libraries/luasocket/libluasocket/unixdgram.c + src/libraries/luasocket/libluasocket/unixdgram.h + src/libraries/luasocket/libluasocket/unixstream.c + src/libraries/luasocket/libluasocket/unixstream.h ) set(LOVE_LINK_L3P_LUASOCKET_LIBLUASOCKET) @@ -1498,12 +1504,6 @@ else() set(LOVE_SRC_3P_LUASOCKET_LIBLUASOCKET ${LOVE_SRC_3P_LUASOCKET_LIBLUASOCKET} src/libraries/luasocket/libluasocket/serial.c - src/libraries/luasocket/libluasocket/unix.c - src/libraries/luasocket/libluasocket/unix.h - src/libraries/luasocket/libluasocket/unixdgram.c - src/libraries/luasocket/libluasocket/unixdgram.h - src/libraries/luasocket/libluasocket/unixstream.c - src/libraries/luasocket/libluasocket/unixstream.h src/libraries/luasocket/libluasocket/usocket.c src/libraries/luasocket/libluasocket/usocket.h ) diff --git a/src/libraries/luasocket/libluasocket/unixdgram.c b/src/libraries/luasocket/libluasocket/unixdgram.c index 69093d734..d00ead742 100644 --- a/src/libraries/luasocket/libluasocket/unixdgram.c +++ b/src/libraries/luasocket/libluasocket/unixdgram.c @@ -12,7 +12,11 @@ #include #include +#ifdef _WIN32 +#include +#else #include +#endif #define UNIXDGRAM_DATAGRAMSIZE 8192 diff --git a/src/libraries/luasocket/libluasocket/unixstream.c b/src/libraries/luasocket/libluasocket/unixstream.c index 02aced9c8..350d0efeb 100644 --- a/src/libraries/luasocket/libluasocket/unixstream.c +++ b/src/libraries/luasocket/libluasocket/unixstream.c @@ -10,7 +10,12 @@ #include "unixstream.h" #include + +#ifdef _WIN32 +#include +#else #include +#endif /*=========================================================================*\ * Internal function prototypes diff --git a/src/libraries/luasocket/luasocket.cpp b/src/libraries/luasocket/luasocket.cpp index bcdb582ff..b46389fa8 100644 --- a/src/libraries/luasocket/luasocket.cpp +++ b/src/libraries/luasocket/luasocket.cpp @@ -24,6 +24,7 @@ extern "C" { #include "libluasocket/luasocket.h" #include "libluasocket/mime.h" +#include "libluasocket/unix.h" } // Lua files @@ -84,6 +85,7 @@ int preload(lua_State * L) // Preload code from LuaSocket. preload(L, "socket.core", luaopen_socket_core); + preload(L, "socket.unix", luaopen_socket_unix); preload(L, "mime.core", luaopen_mime_core); preload(L, "socket", "=[socket \"socket.lua\"]", socket_lua, sizeof(socket_lua));