Support build for Lua 5.1 (for LuaJIT), Lua 5.2 and Lua 5.3 (Step 7/7)

See #195

Makefile

@@ -135,7 +135,7 @@ ifdef WITH_LUAJIT_SHARED
   LIBS += -lluajit-5.1
 else
 ifdef WITH_LUA_SHARED
-  LIBS += -llua5.1
+  LIBS += $(LUA_SHARED_LIB_FLAG)
 endif
 endif
 

resources/Makefile.in-lua

@@ -17,16 +17,19 @@ LUA_VERSION_KNOWN = 0
 ifeq ($(WITH_LUA_VERSION), 501)
   $(info Lua: Using version 5.1.5)
   LUA_DIR = src/third_party/lua-5.1.5/src
+  LUA_SHARED_LIB_FLAG = -llua5.1
   LUA_VERSION_KNOWN = 1
 endif
 ifeq ($(WITH_LUA_VERSION), 502)
   $(info Lua: Using version 5.2.4)
   LUA_DIR = src/third_party/lua-5.2.4/src
+  LUA_SHARED_LIB_FLAG = -llua5.2
   LUA_VERSION_KNOWN = 1
 endif
 ifeq ($(WITH_LUA_VERSION), 503)
   $(info Lua: Using version 5.3.0)
   LUA_DIR = src/third_party/lua-5.3.0/src
+  LUA_SHARED_LIB_FLAG = -llua5.3
   LUA_VERSION_KNOWN = 1
 endif
 
@@ -90,12 +93,22 @@ endif
 LUA_SOURCES = $(addprefix $(LUA_DIR)/, $(LUA_SOURCE_FILES))
 LUA_OBJECTS = $(LUA_SOURCES:.c=.o)
 
+OBJECTS += $(LUA_OBJECTS)
+CFLAGS += $(LUA_CFLAGS)
+SOURCE_DIRS = $(LUA_DIR)
+
+
 SQLITE_DIR = src/third_party
 # SQLITE_SOURCE_FILES = 
 SQLITE_SOURCE_FILES = sqlite3.c lsqlite3.c
 SQLITE_SOURCES = $(addprefix $(SQLITE_DIR)/, $(SQLITE_SOURCE_FILES))
 SQLITE_OBJECTS = $(SQLITE_SOURCES:.c=.o)
 SQLITE_CFLAGS = -I$(SQLITE_DIR) -DTHREADSAFE=1 -DSQLITE_ENABLE_FTS3 -DSQLITE_ENABLE_FTS3_PARENTHESIS
+OBJECTS += $(SQLITE_OBJECTS)
+CFLAGS += $(SQLITE_CFLAGS)
+CFLAGS += -DUSE_LUA_SQLITE3
+#SOURCE_DIRS = $(SQLITE_DIR)
+
 
 LFS_DIR = src/third_party
 # LFS_SOURCE_FILES = 
@@ -103,6 +116,11 @@ LFS_SOURCE_FILES = lfs.c
 LFS_SOURCES = $(addprefix $(LFS_DIR)/, $(LFS_SOURCE_FILES))
 LFS_OBJECTS = $(LFS_SOURCES:.c=.o)
 LFS_CFLAGS = -I$(LFS_DIR)
+OBJECTS += $(LFS_OBJECTS)
+CFLAGS += $(LFS_CFLAGS) 
+CFLAGS += -DUSE_LUA_FILE_SYSTEM
+#SOURCE_DIRS = $(LFS_DIR)
+
 
 LXML_DIR = src/third_party
 # LXML_SOURCE_FILES =
@@ -110,9 +128,8 @@ LXML_SOURCE_FILES = LuaXML_lib.c
 LXML_SOURCES = $(addprefix $(LXML_DIR)/, $(LXML_SOURCE_FILES))
 LXML_OBJECTS = $(LXML_SOURCES:.c=.o)
 LXML_CFLAGS = -I$(LXML_DIR)
-
-OBJECTS += $(LUA_OBJECTS) $(SQLITE_OBJECTS) $(LFS_OBJECTS) $(LXML_OBJECTS)
-CFLAGS += $(LUA_CFLAGS) $(SQLITE_CFLAGS) $(LFS_CFLAGS) 
-CFLAGS += -DUSE_LUA_SQLITE3 -DUSE_LUA_FILE_SYSTEM -DUSE_LUA_LUAXML
-SOURCE_DIRS = $(LUA_DIR)
+OBJECTS += $(LXML_OBJECTS)
+CFLAGS += $(LXML_CFLAGS) 
+CFLAGS += -DUSE_LUA_LUAXML
+#SOURCE_DIRS = $(LXML_DIR)