aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmakefile6
-rwxr-xr-xsrc/makefile12
2 files changed, 12 insertions, 6 deletions
diff --git a/makefile b/makefile
index f766a25..63d9985 100755
--- a/makefile
+++ b/makefile
@@ -33,6 +33,9 @@ install-both:
33 $(MAKE) clean 33 $(MAKE) clean
34 @cd src; $(MAKE) $(PLAT) LUAV=5.3 34 @cd src; $(MAKE) $(PLAT) LUAV=5.3
35 @cd src; $(MAKE) install LUAV=5.3 35 @cd src; $(MAKE) install LUAV=5.3
36 $(MAKE) clean
37 @cd src; $(MAKE) $(PLAT) LUAV=5.4
38 @cd src; $(MAKE) install LUAV=5.4
36 39
37install-both-unix: 40install-both-unix:
38 $(MAKE) clean 41 $(MAKE) clean
@@ -44,6 +47,9 @@ install-both-unix:
44 $(MAKE) clean 47 $(MAKE) clean
45 @cd src; $(MAKE) $(PLAT) LUAV=5.3 48 @cd src; $(MAKE) $(PLAT) LUAV=5.3
46 @cd src; $(MAKE) install-unix LUAV=5.3 49 @cd src; $(MAKE) install-unix LUAV=5.3
50 $(MAKE) clean
51 @cd src; $(MAKE) $(PLAT) LUAV=5.4
52 @cd src; $(MAKE) install-unix LUAV=5.4
47 53
48.PHONY: test 54.PHONY: test
49 55
diff --git a/src/makefile b/src/makefile
index 522d378..f95498a 100755
--- a/src/makefile
+++ b/src/makefile
@@ -16,7 +16,7 @@
16# platform to build for 16# platform to build for
17PLAT?=linux 17PLAT?=linux
18 18
19# LUAV: 5.1 5.2 19# LUAV: 5.1 5.2 5.3 5.4
20# lua version to build against 20# lua version to build against
21LUAV?=5.1 21LUAV?=5.1
22 22
@@ -163,7 +163,7 @@ O_macosx=o
163CC_macosx=gcc 163CC_macosx=gcc
164DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN 164DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
165CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common 165CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
166LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o 166LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o
167LD_macosx=gcc 167LD_macosx=gcc
168SOCKET_macosx=usocket.o 168SOCKET_macosx=usocket.o
169 169
@@ -176,7 +176,7 @@ CC_linux=gcc
176DEF_linux=-DLUASOCKET_$(DEBUG) 176DEF_linux=-DLUASOCKET_$(DEBUG)
177CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ 177CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
178 -Wimplicit -O2 -ggdb3 -fpic 178 -Wimplicit -O2 -ggdb3 -fpic
179LDFLAGS_linux=-O -shared -fpic -o 179LDFLAGS_linux=-O -shared -fpic -o
180LD_linux=gcc 180LD_linux=gcc
181SOCKET_linux=usocket.o 181SOCKET_linux=usocket.o
182 182
@@ -189,7 +189,7 @@ CC_freebsd=gcc
189DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN 189DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN
190CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ 190CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
191 -Wimplicit -O2 -ggdb3 -fpic 191 -Wimplicit -O2 -ggdb3 -fpic
192LDFLAGS_freebsd=-O -shared -fpic -o 192LDFLAGS_freebsd=-O -shared -fpic -o
193LD_freebsd=gcc 193LD_freebsd=gcc
194SOCKET_freebsd=usocket.o 194SOCKET_freebsd=usocket.o
195 195
@@ -202,7 +202,7 @@ CC_solaris=gcc
202DEF_solaris=-DLUASOCKET_$(DEBUG) 202DEF_solaris=-DLUASOCKET_$(DEBUG)
203CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ 203CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \
204 -Wimplicit -O2 -ggdb3 -fpic 204 -Wimplicit -O2 -ggdb3 -fpic
205LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o 205LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o
206LD_solaris=gcc 206LD_solaris=gcc
207SOCKET_solaris=usocket.o 207SOCKET_solaris=usocket.o
208 208
@@ -215,7 +215,7 @@ CC_mingw=gcc
215DEF_mingw= -DLUASOCKET_$(DEBUG) \ 215DEF_mingw= -DLUASOCKET_$(DEBUG) \
216 -DWINVER=0x0501 216 -DWINVER=0x0501
217CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common 217CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common
218LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o 218LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o
219LD_mingw=gcc 219LD_mingw=gcc
220SOCKET_mingw=wsocket.o 220SOCKET_mingw=wsocket.o
221 221