From 8f5c3eceb6b67ad00949b5c0ca5b28ff4ea32ff1 Mon Sep 17 00:00:00 2001 From: bel2125 Date: Sun, 23 Aug 2015 10:52:45 +0200 Subject: [PATCH] LuaJIT support (Step 3/3) --- resources/Makefile.in-lua | 44 +++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/resources/Makefile.in-lua b/resources/Makefile.in-lua index 4704e903..af60756d 100644 --- a/resources/Makefile.in-lua +++ b/resources/Makefile.in-lua @@ -98,20 +98,20 @@ 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) +ifneq ($(WITH_LUA_VERSION), 501) + SQLITE_DIR = src/third_party + 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) +endif LFS_DIR = src/third_party -# LFS_SOURCE_FILES = LFS_SOURCE_FILES = lfs.c LFS_SOURCES = $(addprefix $(LFS_DIR)/, $(LFS_SOURCE_FILES)) LFS_OBJECTS = $(LFS_SOURCES:.c=.o) @@ -122,14 +122,14 @@ CFLAGS += -DUSE_LUA_FILE_SYSTEM #SOURCE_DIRS = $(LFS_DIR) -LXML_DIR = src/third_party -# LXML_SOURCE_FILES = -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 += $(LXML_OBJECTS) -CFLAGS += $(LXML_CFLAGS) -CFLAGS += -DUSE_LUA_LUAXML -#SOURCE_DIRS = $(LXML_DIR) - +ifneq ($(WITH_LUA_VERSION), 501) + LXML_DIR = src/third_party + 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 += $(LXML_OBJECTS) + CFLAGS += $(LXML_CFLAGS) + CFLAGS += -DUSE_LUA_LUAXML + #SOURCE_DIRS = $(LXML_DIR) +endif