Просмотр исходного кода

Define LUA_USE_POSIX to use the more secure mkstemp, fix 'target was given more than once in the same rule'

Dialga 10 лет назад
Родитель
Сommit
fb4c3f66a5
1 измененных файлов с 5 добавлено и 2 удалено
  1. 5 2
      resources/Makefile.in-lua

+ 5 - 2
resources/Makefile.in-lua

@@ -12,9 +12,12 @@ endif
 LUA_DIR = src/third_party/lua-5.2.4/src
 LUA_DIR = src/third_party/lua-5.2.4/src
 LUA_CFLAGS = -I$(LUA_DIR) -DLUA_COMPAT_ALL -DUSE_LUA
 LUA_CFLAGS = -I$(LUA_DIR) -DLUA_COMPAT_ALL -DUSE_LUA
 
 
+ifneq ($(OS),Windows_NT)
+  LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
+endif
+
 ifdef WITH_LUA_SHARED
 ifdef WITH_LUA_SHARED
 
 
-  LUA_CFLAGS += -DLUA_USE_POSIX -DLUA_USE_DLOPEN
   LUA_SOURCE_FILES =
   LUA_SOURCE_FILES =
 
 
   $(info Lua: using dynamic linking)
   $(info Lua: using dynamic linking)
@@ -81,5 +84,5 @@ LXML_CFLAGS = -I$(LXML_DIR)
 
 
 OBJECTS += $(LUA_OBJECTS) $(SQLITE_OBJECTS) $(LFS_OBJECTS) $(LXML_OBJECTS)
 OBJECTS += $(LUA_OBJECTS) $(SQLITE_OBJECTS) $(LFS_OBJECTS) $(LXML_OBJECTS)
 CFLAGS += $(LUA_CFLAGS) $(SQLITE_CFLAGS) $(LFS_CFLAGS) -DUSE_LUA_SQLITE3 -DUSE_LUA_FILE_SYSTEM -DUSE_LUA_LUAXML
 CFLAGS += $(LUA_CFLAGS) $(SQLITE_CFLAGS) $(LFS_CFLAGS) -DUSE_LUA_SQLITE3 -DUSE_LUA_FILE_SYSTEM -DUSE_LUA_LUAXML
-SOURCE_DIRS = $(LUA_DIR) $(SQLITE_DIR) $(LFS_DIR) $(LXML_DIR)
+SOURCE_DIRS = $(LUA_DIR)