Unverified Commit 67f0aca9 authored by Jean-Andre Santoni's avatar Jean-Andre Santoni Committed by GitHub
Browse files

Luasocket for windows (#210)

* Luasocket for windows

* Try to fix linking

* Try to fix linking
parent 29a80315
...@@ -75,3 +75,9 @@ jobs: ...@@ -75,3 +75,9 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- run: CC=gcc make -j4 platform=win config=player WANT_JIT=1 - run: CC=gcc make -j4 platform=win config=player WANT_JIT=1
build_windows_luasocket:
runs-on: windows-latest
steps:
- uses: actions/checkout@v2
- run: CC=gcc make -j4 platform=win config=player WANT_LUASOCKET=1
...@@ -345,9 +345,11 @@ else ifeq ($(platform), sncps3) ...@@ -345,9 +345,11 @@ else ifeq ($(platform), sncps3)
STATIC_LINKING = 1 STATIC_LINKING = 1
MMD := MMD :=
else else
CC ?= gcc
TARGET := $(TARGET_NAME)_libretro.dll TARGET := $(TARGET_NAME)_libretro.dll
SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--no-undefined SHARED := -shared -static-libgcc -static-libstdc++ -s -Wl,--no-undefined
ifeq ($(WANT_LUASOCKET),1)
LIBS += -lwsock32 -lws2_32
endif
endif endif
# platform agnostic defines/flags setup # # platform agnostic defines/flags setup #
......
...@@ -109,12 +109,13 @@ SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/auxiliar.c \ ...@@ -109,12 +109,13 @@ SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/auxiliar.c \
$(CORE_DIR)/deps/luasocket/libluasocket/tcp.c \ $(CORE_DIR)/deps/luasocket/libluasocket/tcp.c \
$(CORE_DIR)/deps/luasocket/libluasocket/timeout.c \ $(CORE_DIR)/deps/luasocket/libluasocket/timeout.c \
$(CORE_DIR)/deps/luasocket/libluasocket/udp.c \ $(CORE_DIR)/deps/luasocket/libluasocket/udp.c \
$(CORE_DIR)/deps/luasocket/libluasocket/unix.c \
$(CORE_DIR)/deps/luasocket/luasocket.c $(CORE_DIR)/deps/luasocket/luasocket.c
ifeq ($(system_platform), unix) ifeq ($(system_platform), unix)
SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/usocket.c SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/usocket.c \
$(CORE_DIR)/deps/luasocket/libluasocket/unix.c
else ifeq ($(system_platform), osx) else ifeq ($(system_platform), osx)
SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/usocket.c SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/usocket.c
$(CORE_DIR)/deps/luasocket/libluasocket/unix.c
else else
SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/wsocket.c SOURCES_C += $(CORE_DIR)/deps/luasocket/libluasocket/wsocket.c
endif 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