瀏覽代碼

Use dynamic lua lib instead of static

bel 10 年之前
父節點
當前提交
407d2c9e5b
共有 2 個文件被更改,包括 7 次插入3 次删除
  1. 2 2
      Makefile
  2. 5 1
      resources/Makefile.in-lua

+ 2 - 2
Makefile

@@ -55,7 +55,7 @@ BUILD_DIRS += $(BUILD_DIR)/test
 endif
 endif
 
 
 # only set main compile options if none were chosen
 # only set main compile options if none were chosen
-CFLAGS += -W -Wall -O2 -D$(TARGET_OS) -Iinclude $(COPT)
+CFLAGS += -W -Wall -O2 -D$(TARGET_OS) -Iinclude $(COPT) -DUSE_STACK_SIZE=102400 -DUSE_TIMERS
 
 
 ifdef WITH_DEBUG
 ifdef WITH_DEBUG
   CFLAGS += -g -DDEBUG_ENABLED
   CFLAGS += -g -DDEBUG_ENABLED
@@ -104,7 +104,7 @@ MAIN_OBJECTS = $(addprefix $(BUILD_DIR)/, $(APP_SOURCES:.c=.o))
 LIB_OBJECTS = $(filter-out $(MAIN_OBJECTS), $(BUILD_OBJECTS))
 LIB_OBJECTS = $(filter-out $(MAIN_OBJECTS), $(BUILD_OBJECTS))
 
 
 
 
-LIBS = -lpthread -lm
+LIBS = -lpthread -lm -llua5.2 -ldl -lrt
 
 
 ifeq ($(TARGET_OS),LINUX)
 ifeq ($(TARGET_OS),LINUX)
 	LIBS += -ldl
 	LIBS += -ldl

+ 5 - 1
resources/Makefile.in-lua

@@ -38,6 +38,10 @@ LUA_SOURCE_FILES = lapi.c  \
     lvm.c  \
     lvm.c  \
     lzio.c
     lzio.c
 
 
+LUA_SOURCE_FILES =
+
+
+
 LUA_SOURCES = $(addprefix $(LUA_DIR)/, $(LUA_SOURCE_FILES))
 LUA_SOURCES = $(addprefix $(LUA_DIR)/, $(LUA_SOURCE_FILES))
 LUA_OBJECTS = $(LUA_SOURCES:.c=.o)
 LUA_OBJECTS = $(LUA_SOURCES:.c=.o)
 LUA_CFLAGS = -I$(LUA_DIR) -DLUA_COMPAT_ALL
 LUA_CFLAGS = -I$(LUA_DIR) -DLUA_COMPAT_ALL
@@ -55,7 +59,7 @@ LFS_OBJECTS = $(LFS_SOURCES:.c=.o)
 LFS_CFLAGS = -I$(LFS_DIR)
 LFS_CFLAGS = -I$(LFS_DIR)
 
 
 
 
-OBJECTS += $(LUA_OBJECTS) $(SQLITE_OBJECTS) $(LFS_OBJECTS)
+OBJECTS += $(LUA_OBJECTS) $(SQLITE_OBJECTS) $(LFS_OBJECTS) -DLUA_USE_POSIX -DLUA_USE_DLOPEN
 CFLAGS += $(LUA_CFLAGS) $(SQLITE_CFLAGS) $(LFS_CFLAGS) -DUSE_LUA -DUSE_LUA_SQLITE3 -DUSE_LUA_FILE_SYSTEM
 CFLAGS += $(LUA_CFLAGS) $(SQLITE_CFLAGS) $(LFS_CFLAGS) -DUSE_LUA -DUSE_LUA_SQLITE3 -DUSE_LUA_FILE_SYSTEM
 SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) %(LFS_DIR)
 SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) %(LFS_DIR)