Browse code
app_lua_sr: Makefile - reworked detection of lua version with support for 5.3 and 5.4
Daniel-Constantin Mierla authored on 24/01/2022 12:49:37
Showing 1 changed files
| ... | ... |
@@ -5,6 +5,8 @@ include ../../Makefile.defs |
| 5 | 5 |
auto_gen= |
| 6 | 6 |
NAME=app_lua_sr.so |
| 7 | 7 |
|
| 8 |
+LUALIB=lua |
|
| 9 |
+ |
|
| 8 | 10 |
ifeq ($(LUAJIT),) |
| 9 | 11 |
ifeq ($(CROSS_COMPILE),) |
| 10 | 12 |
BUILDER = $(shell which lua-config) |
| ... | ... |
@@ -15,78 +17,55 @@ ifeq ($(LUAJIT),) |
| 15 | 17 |
BUILDER = $(shell which pkg-config) |
| 16 | 18 |
endif |
| 17 | 19 |
ifeq ($(BUILDER),) |
| 18 |
- LUA51 = $(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.1) |
|
| 19 |
- DEFS+= -I$(LOCALBASE)/include |
|
| 20 |
- LIBS+= -L$(LOCALBASE)/lib -lm |
|
| 21 |
- ifneq ($(LUA51),) |
|
| 22 |
- DEFS+= -I$(LOCALBASE)/include/lua5.1 |
|
| 23 |
- LIBS+= -llua5.1 |
|
| 24 |
- else |
|
| 25 |
- LUA52 = $(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.2) |
|
| 26 |
- ifneq ($(LUA52),) |
|
| 27 |
- DEFS+= -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include/lua5.2 |
|
| 28 |
- LIBS+= -llua5.2 |
|
| 29 |
- else |
|
| 30 |
- DEFS+= -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include/lua |
|
| 31 |
- LIBS+= -llua |
|
| 32 |
- endif |
|
| 20 |
+ # no pkg-config - try finding by path |
|
| 21 |
+ ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.1),) |
|
| 22 |
+ LUALIB=lua5.1 |
|
| 23 |
+ else ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.2),) |
|
| 24 |
+ LUALIB=lua5.2 |
|
| 25 |
+ else ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.3),) |
|
| 26 |
+ LUALIB=lua5.3 |
|
| 27 |
+ else ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.4),) |
|
| 28 |
+ LUALIB=lua5.4 |
|
| 33 | 29 |
endif |
| 30 |
+ DEFS+= -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include -I$(LOCALBASE)/include/$(LUALIB) |
|
| 31 |
+ LIBS+= -L$(LOCALBASE)/lib -l$(LUALIB) -lm |
|
| 34 | 32 |
else |
| 35 |
- LUAVER=XX |
|
| 36 |
- LUALIBS = $(shell pkg-config --silence-errors --libs lua-5.1) |
|
| 37 |
- ifeq ($(LUALIBS),) |
|
| 38 |
- LUALIBS = $(shell pkg-config --silence-errors --libs lua5.1) |
|
| 39 |
- ifeq ($(LUALIBS),) |
|
| 40 |
- LUALIBS = $(shell pkg-config --silence-errors --libs lua5.2) |
|
| 41 |
- ifeq ($(LUALIBS),) |
|
| 42 |
- LUALIBS = $(shell pkg-config --silence-errors --libs lua) |
|
| 43 |
- ifneq ($(LUALIBS),) |
|
| 44 |
- LUAVER=5X |
|
| 45 |
- endif |
|
| 46 |
- else |
|
| 47 |
- LUAVER=52 |
|
| 48 |
- endif |
|
| 49 |
- else |
|
| 50 |
- LUAVER=51 |
|
| 51 |
- endif |
|
| 33 |
+ ifneq ($(shell pkg-config --silence-errors --libs lua-5.1),) |
|
| 34 |
+ LUALIB=lua-5.1 |
|
| 35 |
+ else ifneq ($(shell pkg-config --silence-errors --libs lua5.1),) |
|
| 36 |
+ LUALIB=lua5.1 |
|
| 37 |
+ else ifneq ($(shell pkg-config --silence-errors --libs lua5.2),) |
|
| 38 |
+ LUALIB=lua5.2 |
|
| 39 |
+ else ifneq ($(shell pkg-config --silence-errors --libs lua5.3),) |
|
| 40 |
+ LUALIB=lua5.3 |
|
| 41 |
+ else ifneq ($(shell pkg-config --silence-errors --libs lua5.4),) |
|
| 42 |
+ LUALIB=lua5.4 |
|
| 43 |
+ else ifneq ($(shell pkg-config --silence-errors --libs lua),) |
|
| 44 |
+ LUALIB=lua |
|
| 52 | 45 |
else |
| 53 |
- LUAVER=51X |
|
| 46 |
+ LUALIB= |
|
| 54 | 47 |
endif |
| 55 |
- ifeq ($(LUAVER),XX) |
|
| 56 |
- LUA51 = $(shell ls /usr/lib/liblua* | grep liblua5.1) |
|
| 57 |
- ifneq ($(LUA51),) |
|
| 58 |
- DEFS+= -I/usr/include/lua5.1 |
|
| 59 |
- LIBS = -llua5.1 -lm |
|
| 60 |
- else |
|
| 61 |
- LUA52 = $(shell ls /usr/lib/liblua* | grep liblua5.2) |
|
| 62 |
- ifneq ($(LUA51),) |
|
| 63 |
- DEFS+= -DLUA_COMPAT_MODULE -I/usr/include/lua5.2 |
|
| 64 |
- LIBS = -llua5.2 -lm |
|
| 65 |
- else |
|
| 66 |
- DEFS+= -DLUA_COMPAT_MODULE -I/usr/include/lua |
|
| 67 |
- LIBS = -llua -lm |
|
| 68 |
- endif |
|
| 69 |
- endif |
|
| 48 |
+ ifeq ($(LUALIB),lua5.1) |
|
| 49 |
+ DEFS+= $(shell pkg-config --cflags lua5.1 | sed -e "s/\\\\/'/" -e "s/\\\\\"/\"'/") |
|
| 50 |
+ LIBS = $(shell pkg-config --libs lua5.1) |
|
| 51 |
+ else ifneq ($(LUALIB),) |
|
| 52 |
+ DEFS+= -DLUA_COMPAT_MODULE |
|
| 53 |
+ DEFS+= $(shell pkg-config --cflags $(LUALIB)) |
|
| 54 |
+ LIBS = $(shell pkg-config --libs $(LUALIB)) |
|
| 70 | 55 |
else |
| 71 |
- ifeq ($(LUAVER),51) |
|
| 72 |
- DEFS+= $(shell pkg-config --cflags lua5.1 | sed -e "s/\\\\/'/" -e "s/\\\\\"/\"'/") |
|
| 73 |
- LIBS = $(shell pkg-config --libs lua5.1) |
|
| 74 |
- else |
|
| 75 |
- ifeq ($(LUAVER),51X) |
|
| 76 |
- DEFS+= $(shell pkg-config --cflags lua-5.1) |
|
| 77 |
- LIBS = $(shell pkg-config --libs lua-5.1) |
|
| 78 |
- else |
|
| 79 |
- ifeq ($(LUAVER),52) |
|
| 80 |
- DEFS+= -DLUA_COMPAT_MODULE |
|
| 81 |
- DEFS+= $(shell pkg-config --cflags lua5.2) |
|
| 82 |
- LIBS = $(shell pkg-config --libs lua5.2) |
|
| 83 |
- else |
|
| 84 |
- DEFS+= -DLUA_COMPAT_MODULE |
|
| 85 |
- DEFS+= $(shell pkg-config --cflags lua) |
|
| 86 |
- LIBS = $(shell pkg-config --libs lua) |
|
| 87 |
- endif |
|
| 88 |
- endif |
|
| 56 |
+ # pkg-config with no lua library detected - try finding by path |
|
| 57 |
+ LUALIB=lua |
|
| 58 |
+ ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.1),) |
|
| 59 |
+ LUALIB=lua5.1 |
|
| 60 |
+ else ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.2),) |
|
| 61 |
+ LUALIB=lua5.2 |
|
| 62 |
+ else ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.3),) |
|
| 63 |
+ LUALIB=lua5.3 |
|
| 64 |
+ else ifneq ($(shell ls $(LOCALBASE)/lib/liblua* | grep liblua5.4),) |
|
| 65 |
+ LUALIB=lua5.4 |
|
| 89 | 66 |
endif |
| 67 |
+ DEFS+= -DLUA_COMPAT_MODULE -I$(LOCALBASE)/include -I$(LOCALBASE)/include/$(LUALIB) |
|
| 68 |
+ LIBS+= -L$(LOCALBASE)/lib -l$(LUALIB) -lm |
|
| 90 | 69 |
endif |
| 91 | 70 |
endif |
| 92 | 71 |
else |
| ... | ... |
@@ -94,8 +73,10 @@ ifeq ($(LUAJIT),) |
| 94 | 73 |
LIBS = $(shell lua-config --libs) |
| 95 | 74 |
endif |
| 96 | 75 |
else |
| 97 |
- # Build using LuaJIT |
|
| 98 |
- BUILDER = $(shell which pkg-config) |
|
| 76 |
+ # build using LuaJIT |
|
| 77 |
+ ifeq ($(CROSS_COMPILE),) |
|
| 78 |
+ BUILDER = $(shell which pkg-config) |
|
| 79 |
+ endif |
|
| 99 | 80 |
ifeq ($(BUILDER),) |
| 100 | 81 |
DEFS+= -I/usr/include/luajit-2.1 |
| 101 | 82 |
LIBS = -lluajit-5.1 |