Unverified Commit 29a80315 authored by Jean-Andre Santoni's avatar Jean-Andre Santoni Committed by GitHub
Browse files

Fix luasocket support (#209)

* Fix luasocket support

* Add CI
parent 4fba8e8b
Pipeline #22929 passed with stages
in 13 minutes and 53 seconds
......@@ -29,6 +29,12 @@ jobs:
- uses: actions/checkout@v2
- run: make -j4 config=player WANT_JIT=1
build_linux_luasocket:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: make -j4 config=player WANT_LUASOCKET=1
build_linux_armv7_neon:
runs-on: ubuntu-latest
container: dockcross/linux-armv7
......
......@@ -412,6 +412,10 @@ ifeq ($(WANT_JIT),1)
CFLAGS += -DHAVE_JIT
endif
ifeq ($(WANT_LUASOCKET),1)
CFLAGS += -DHAVE_LUASOCKET
endif
CFLAGS += -I$(LUADIR) $(DEFINES) -DOUTSIDE_SPEEX -DRANDOM_PREFIX=speex -DEXPORT= -DFIXED_POINT
LIBS += $(LUALIB) $(LIBM)
......
......@@ -111,7 +111,9 @@ SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/auxiliar.c \
$(CORE_DIR)/deps/luasocket/libluasocket/udp.c \
$(CORE_DIR)/deps/luasocket/libluasocket/unix.c \
$(CORE_DIR)/deps/luasocket/luasocket.c
ifeq ($(system_platform),unix)
ifeq ($(system_platform), unix)
SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/usocket.c
else ifeq ($(system_platform), osx)
SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/usocket.c
else
SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/wsocket.c
......
......@@ -30,7 +30,7 @@
#include "deps/luautf8/lutf8lib.h"
// LuaSocket
#ifdef WANT_LUASOCKET
#ifdef HAVE_LUASOCKET
#include "deps/luasocket/luasocket.h"
#endif
......@@ -256,7 +256,7 @@ void lutro_init()
lutro_preload(L, luaopen_luautf8, "utf8");
// LuaSocket
#ifdef WANT_LUASOCKET
#ifdef HAVE_LUASOCKET
_o_open(L);
#endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment