diff options
-rwxr-xr-x | makefile | 6 | ||||
-rwxr-xr-x | src/makefile | 12 |
2 files changed, 12 insertions, 6 deletions
@@ -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 | ||
37 | install-both-unix: | 40 | install-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 |
17 | PLAT?=linux | 17 | PLAT?=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 |
21 | LUAV?=5.1 | 21 | LUAV?=5.1 |
22 | 22 | ||
@@ -163,7 +163,7 @@ O_macosx=o | |||
163 | CC_macosx=gcc | 163 | CC_macosx=gcc |
164 | DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN | 164 | DEF_macosx= -DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN |
165 | CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common | 165 | CFLAGS_macosx=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common |
166 | LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o | 166 | LDFLAGS_macosx= -bundle -undefined dynamic_lookup -o |
167 | LD_macosx=gcc | 167 | LD_macosx=gcc |
168 | SOCKET_macosx=usocket.o | 168 | SOCKET_macosx=usocket.o |
169 | 169 | ||
@@ -176,7 +176,7 @@ CC_linux=gcc | |||
176 | DEF_linux=-DLUASOCKET_$(DEBUG) | 176 | DEF_linux=-DLUASOCKET_$(DEBUG) |
177 | CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ | 177 | CFLAGS_linux=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ |
178 | -Wimplicit -O2 -ggdb3 -fpic | 178 | -Wimplicit -O2 -ggdb3 -fpic |
179 | LDFLAGS_linux=-O -shared -fpic -o | 179 | LDFLAGS_linux=-O -shared -fpic -o |
180 | LD_linux=gcc | 180 | LD_linux=gcc |
181 | SOCKET_linux=usocket.o | 181 | SOCKET_linux=usocket.o |
182 | 182 | ||
@@ -189,7 +189,7 @@ CC_freebsd=gcc | |||
189 | DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN | 189 | DEF_freebsd=-DLUASOCKET_$(DEBUG) -DUNIX_HAS_SUN_LEN |
190 | CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ | 190 | CFLAGS_freebsd=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ |
191 | -Wimplicit -O2 -ggdb3 -fpic | 191 | -Wimplicit -O2 -ggdb3 -fpic |
192 | LDFLAGS_freebsd=-O -shared -fpic -o | 192 | LDFLAGS_freebsd=-O -shared -fpic -o |
193 | LD_freebsd=gcc | 193 | LD_freebsd=gcc |
194 | SOCKET_freebsd=usocket.o | 194 | SOCKET_freebsd=usocket.o |
195 | 195 | ||
@@ -202,7 +202,7 @@ CC_solaris=gcc | |||
202 | DEF_solaris=-DLUASOCKET_$(DEBUG) | 202 | DEF_solaris=-DLUASOCKET_$(DEBUG) |
203 | CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ | 203 | CFLAGS_solaris=$(LUAINC:%=-I%) $(DEF) -Wall -Wshadow -Wextra \ |
204 | -Wimplicit -O2 -ggdb3 -fpic | 204 | -Wimplicit -O2 -ggdb3 -fpic |
205 | LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o | 205 | LDFLAGS_solaris=-lnsl -lsocket -lresolv -O -shared -fpic -o |
206 | LD_solaris=gcc | 206 | LD_solaris=gcc |
207 | SOCKET_solaris=usocket.o | 207 | SOCKET_solaris=usocket.o |
208 | 208 | ||
@@ -215,7 +215,7 @@ CC_mingw=gcc | |||
215 | DEF_mingw= -DLUASOCKET_$(DEBUG) \ | 215 | DEF_mingw= -DLUASOCKET_$(DEBUG) \ |
216 | -DWINVER=0x0501 | 216 | -DWINVER=0x0501 |
217 | CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common | 217 | CFLAGS_mingw=$(LUAINC:%=-I%) $(DEF) -Wall -O2 -fno-common |
218 | LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o | 218 | LDFLAGS_mingw= $(LUALIB) -shared -Wl,-s -lws2_32 -o |
219 | LD_mingw=gcc | 219 | LD_mingw=gcc |
220 | SOCKET_mingw=wsocket.o | 220 | SOCKET_mingw=wsocket.o |
221 | 221 | ||