mirror of
https://github.com/lunarmodules/luasocket.git
synced 2024-12-26 04:28:20 +01:00
Merge pull request #366 from lunarmodules/54
This commit is contained in:
commit
78d2cbfdee
6
makefile
6
makefile
@ -33,6 +33,9 @@ install-both:
|
|||||||
$(MAKE) clean
|
$(MAKE) clean
|
||||||
@cd src; $(MAKE) $(PLAT) LUAV=5.3
|
@cd src; $(MAKE) $(PLAT) LUAV=5.3
|
||||||
@cd src; $(MAKE) install LUAV=5.3
|
@cd src; $(MAKE) install LUAV=5.3
|
||||||
|
$(MAKE) clean
|
||||||
|
@cd src; $(MAKE) $(PLAT) LUAV=5.4
|
||||||
|
@cd src; $(MAKE) install LUAV=5.4
|
||||||
|
|
||||||
install-both-unix:
|
install-both-unix:
|
||||||
$(MAKE) clean
|
$(MAKE) clean
|
||||||
@ -44,6 +47,9 @@ install-both-unix:
|
|||||||
$(MAKE) clean
|
$(MAKE) clean
|
||||||
@cd src; $(MAKE) $(PLAT) LUAV=5.3
|
@cd src; $(MAKE) $(PLAT) LUAV=5.3
|
||||||
@cd src; $(MAKE) install-unix LUAV=5.3
|
@cd src; $(MAKE) install-unix LUAV=5.3
|
||||||
|
$(MAKE) clean
|
||||||
|
@cd src; $(MAKE) $(PLAT) LUAV=5.4
|
||||||
|
@cd src; $(MAKE) install-unix LUAV=5.4
|
||||||
|
|
||||||
.PHONY: test
|
.PHONY: test
|
||||||
|
|
||||||
|
12
src/makefile
12
src/makefile
@ -16,7 +16,7 @@
|
|||||||
# platform to build for
|
# platform to build for
|
||||||
PLAT?=linux
|
PLAT?=linux
|
||||||
|
|
||||||
# LUAV: 5.1 5.2
|
# LUAV: 5.1 5.2 5.3 5.4
|
||||||
# lua version to build against
|
# lua version to build against
|
||||||
LUAV?=5.1
|
LUAV?=5.1
|
||||||
|
|
||||||
@ -163,7 +163,7 @@ O_macosx=o
|
|||||||
CC_macosx=gcc
|
CC_macosx=gcc
|
||||||
DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
|
DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
|
||||||
CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
|
CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
|
||||||
LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o
|
LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o
|
||||||
LD_macosx=gcc
|
LD_macosx=gcc
|
||||||
SOCKET_macosx=usocket.o
|
SOCKET_macosx=usocket.o
|
||||||
|
|
||||||
@ -176,7 +176,7 @@ CC_linux=gcc
|
|||||||
DEF_linux=-DLUASOCKET_$(DEBUG)
|
DEF_linux=-DLUASOCKET_$(DEBUG)
|
||||||
CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
|
CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
|
||||||
-Wimplicit -O2 -ggdb3 -fpic
|
-Wimplicit -O2 -ggdb3 -fpic
|
||||||
LDFLAGS_linux=-O -shared -fpic -o
|
LDFLAGS_linux=-O -shared -fpic -o
|
||||||
LD_linux=gcc
|
LD_linux=gcc
|
||||||
SOCKET_linux=usocket.o
|
SOCKET_linux=usocket.o
|
||||||
|
|
||||||
@ -189,7 +189,7 @@ CC_freebsd=gcc
|
|||||||
DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
|
DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
|
||||||
CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
|
CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
|
||||||
-Wimplicit -O2 -ggdb3 -fpic
|
-Wimplicit -O2 -ggdb3 -fpic
|
||||||
LDFLAGS_freebsd=-O -shared -fpic -o
|
LDFLAGS_freebsd=-O -shared -fpic -o
|
||||||
LD_freebsd=gcc
|
LD_freebsd=gcc
|
||||||
SOCKET_freebsd=usocket.o
|
SOCKET_freebsd=usocket.o
|
||||||
|
|
||||||
@ -202,7 +202,7 @@ CC_solaris=gcc
|
|||||||
DEF_solaris=-DLUASOCKET_$(DEBUG)
|
DEF_solaris=-DLUASOCKET_$(DEBUG)
|
||||||
CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
|
CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
|
||||||
-Wimplicit -O2 -ggdb3 -fpic
|
-Wimplicit -O2 -ggdb3 -fpic
|
||||||
LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o
|
LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o
|
||||||
LD_solaris=gcc
|
LD_solaris=gcc
|
||||||
SOCKET_solaris=usocket.o
|
SOCKET_solaris=usocket.o
|
||||||
|
|
||||||
@ -215,7 +215,7 @@ CC_mingw=gcc
|
|||||||
DEF_mingw= -DLUASOCKET_$(DEBUG) \
|
DEF_mingw= -DLUASOCKET_$(DEBUG) \
|
||||||
-DWINVER=0x0501
|
-DWINVER=0x0501
|
||||||
CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
|
CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
|
||||||
LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o
|
LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o
|
||||||
LD_mingw=gcc
|
LD_mingw=gcc
|
||||||
SOCKET_mingw=wsocket.o
|
SOCKET_mingw=wsocket.o
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user