Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Libretro
Lutro
Commits
67f0aca9
Unverified
Commit
67f0aca9
authored
May 05, 2021
by
Jean-Andre Santoni
Committed by
GitHub
May 05, 2021
Browse files
Luasocket for windows (#210)
* Luasocket for windows * Try to fix linking * Try to fix linking
parent
29a80315
Changes
3
Hide whitespace changes
Inline
Side-by-side
.github/workflows/ci.yml
View file @
67f0aca9
...
...
@@ -75,3 +75,9 @@ jobs:
-
uses
:
actions/checkout@v2
-
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
Makefile
View file @
67f0aca9
...
...
@@ -345,9 +345,11 @@ else ifeq ($(platform), sncps3)
STATIC_LINKING
=
1
MMD
:=
else
CC
?=
gcc
TARGET
:=
$(TARGET_NAME)
_libretro.dll
SHARED
:=
-shared
-static-libgcc
-static-libstdc
++
-s
-Wl
,--no-undefined
ifeq
($(WANT_LUASOCKET),1)
LIBS
+=
-lwsock32
-lws2_32
endif
endif
# platform agnostic defines/flags setup #
...
...
Makefile.common
View file @
67f0aca9
...
...
@@ -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/timeout.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)
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)
SOURCES_C
+=
$(CORE_DIR)
/deps/luasocket/libluasocket/usocket.c
$(CORE_DIR)/deps/luasocket/libluasocket/unix.c
else
SOURCES_C
+=
$(CORE_DIR)
/deps/luasocket/libluasocket/wsocket.c
endif
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment