浏览代码

Lua 5.4: Add makefile for testing (5.4.0-work1)

bel2125 7 年之前
父节点
当前提交
94a77ae98f
共有 2 个文件被更改,包括 21 次插入2 次删除
  1. 17 2
      resources/Makefile.in-lua
  2. 4 0
      src/third_party/civetweb_lua.h

+ 17 - 2
resources/Makefile.in-lua

@@ -35,6 +35,13 @@ ifeq ($(WITH_LUA_VERSION), 503)
   LUA_CFLAGS = -DLUA_COMPAT_5_2 -DLUA_VERSION_MAKEFILE=503
   LUA_VERSION_KNOWN = 1
 endif
+ifeq ($(WITH_LUA_VERSION), 504)
+  $(info Lua: Using version 5.4.0-work1)
+  LUA_DIR = src/third_party/lua-5.4.0-work1/src
+  LUA_SHARED_LIB_FLAG = -llua5.4
+  LUA_CFLAGS = -DLUA_COMPAT_5_2 -DLUA_VERSION_MAKEFILE=504
+  LUA_VERSION_KNOWN = 1
+endif
 
 ifneq ($(LUA_VERSION_KNOWN), 1)
   $(error Lua: Unknwon version - $(WITH_LUA_VERSION))
@@ -87,12 +94,20 @@ else
     lzio.c
 
 ifeq ($(WITH_LUA_VERSION), 502)
-    LUA_SOURCE_FILES += lbitlib.c  \
+    LUA_SOURCE_FILES += \
+    lbitlib.c  \
     lcorolib.c  \
     lctype.c
 endif
 ifeq ($(WITH_LUA_VERSION), 503)
-    LUA_SOURCE_FILES += lbitlib.c  \
+    LUA_SOURCE_FILES += \
+    lbitlib.c  \
+    lcorolib.c  \
+    lctype.c  \
+    lutf8lib.c
+endif
+ifeq ($(WITH_LUA_VERSION), 504)
+    LUA_SOURCE_FILES += \
     lcorolib.c  \
     lctype.c  \
     lutf8lib.c

+ 4 - 0
src/third_party/civetweb_lua.h

@@ -61,6 +61,10 @@
 /* Lua 5.3 detected */
 #define mg_lua_load lua_load
 
+#elif LUA_VERSION_NUM == 504
+/* Lua 5.4 detected */
+#define mg_lua_load lua_load
+
 #endif
 
 #ifdef LUA_VERSION_MAKEFILE