修复编译问题

Author: actboy168

.vscode/launch.json

@@ -8,13 +8,13 @@
             "console": "integratedTerminal",
             "luaVersion": "lua-latest",
             "windows": {
-                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.10-win32-x64/bin/lua-debug.exe"
+                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.11-win32-x64/bin/lua-debug.exe"
             },
             "linux": {
-                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.10-linux-x64/bin/lua-debug",
+                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.11-linux-x64/bin/lua-debug",
             },
             "osx": {
-                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.10-darwin-arm64/bin/lua-debug",
+                "luaexe": "${command:extensionPath}actboy168.lua-debug-2.0.11-darwin-arm64/bin/lua-debug",
             },
             "outputCapture": [
             ],
@@ -34,7 +34,7 @@
                 "--extensionDevelopmentPath=${workspaceFolder}/extension/"
             ],
             "env": {
-                "VSCODE_EXTENSION_PATH" : "${command:extensionPath}actboy168.lua-debug-2.0.10"
+                "VSCODE_EXTENSION_PATH" : "${command:extensionPath}actboy168.lua-debug-2.0.11"
             }
         }
     ]

compile/common/runtime.lua

@@ -124,16 +124,15 @@ for _, luaver in ipairs {
             }
 
             lm:executable(luaver..'/lua') {
-                rootdir = '3rd/lua/'..luaver,
                 bindir = bindir,
                 output = "lua",
-                deps = luaver..'/'..luaver,
+                deps = luaver.."/"..luaver,
                 includes = {
-                    '..',
+                    "3rd/lua/",
                 },
                 sources = {
-                    "lua.c",
-                    "../../../compile/windows/lua-debug.rc",
+                    "3rd/lua/"..luaver.."/lua.c",
+                    "compile/windows/lua-debug.rc",
                 },
                 defines = {
                     luaver == "lua51" and "_CRT_SECURE_NO_WARNINGS",

compile/luajit/make_windows.lua

@@ -1,11 +1,11 @@
 local lm = require "luamake"
 
 local luaver = "luajit"
-local luajitDir = '3rd/lua/' .. luaver
+local luajitDir = '3rd/lua/'..luaver
 local bindir = "publish/runtime/"..lm.runtime_platform
 
 lm:exe "minilua" {
-    rootdir= luajitDir,
+    rootdir = luajitDir,
     defines = "_CRT_SECURE_NO_WARNINGS",
     sources = {
         "src/host/minilua.c"
@@ -24,9 +24,9 @@ local dynasm_flags = {
     "-D", "FFI",
     "-D", "WIN",
 }
-if arch =="x64" then
-    table.insert(dynasm_flags,"-D")
-    table.insert(dynasm_flags,"P64")
+if arch == "x64" then
+    table.insert(dynasm_flags, "-D")
+    table.insert(dynasm_flags, "P64")
 end
 
 
@@ -44,14 +44,14 @@ lm:build "buildvm_arch" {
         "-o", "$out", "$in",
     },
     inputs = luajitDir.."/"..buildvm_arch_input,
-    outputs =  lm.bindir .."/buildvm_arch.h",
+    outputs = lm.bindir.."/buildvm_arch.h",
 }
 
 lm:exe "buildvm" {
-    rootdir= luajitDir,
+    rootdir = luajitDir,
     deps = "buildvm_arch",
-    objdeps={"buildvm_arch"},
-    defines = {"_CRT_SECURE_NO_WARNINGS"},
+    objdeps = { "buildvm_arch" },
+    defines = { "_CRT_SECURE_NO_WARNINGS" },
     includes = {
         "src",
         "../../../"..lm.bindir
@@ -88,7 +88,7 @@ lm:build "lj_peobj" {
 }
 
 lm:build "lj_bcdef" {
-    rootdir=luajitDir,
+    rootdir = luajitDir,
     deps = "buildvm",
     args = {
         "$bin/buildvm",
@@ -100,7 +100,7 @@ lm:build "lj_bcdef" {
 }
 
 lm:build "lj_ffdef" {
-    rootdir=luajitDir,
+    rootdir = luajitDir,
     deps = "buildvm",
     args = {
         "$bin/buildvm",
@@ -112,7 +112,7 @@ lm:build "lj_ffdef" {
 }
 
 lm:build "lj_libdef" {
-    rootdir=luajitDir,
+    rootdir = luajitDir,
     deps = "buildvm",
     args = {
         "$bin/buildvm",
@@ -124,7 +124,7 @@ lm:build "lj_libdef" {
 }
 
 lm:build "lj_recdef" {
-    rootdir=luajitDir,
+    rootdir = luajitDir,
     deps = "buildvm",
     args = {
         "$bin/buildvm",
@@ -146,9 +146,14 @@ lm:build "lj_folddef" {
     outputs = lm.bindir.."/lj_folddef.h",
 }
 
+lm:source_set "lj_vm.obj" {
+    sources = {
+        lm.bindir.."/lj_vm.obj",
+    },
+}
 
 lm:shared_library "luajit/luajit" {
-    rootdir= luajitDir,
+    rootdir = luajitDir,
     bindir = bindir,
     objdeps = {
         "lj_bcdef",
@@ -158,6 +163,7 @@ lm:shared_library "luajit/luajit" {
         --"lj_vmdef",
         "lj_folddef",
     },
+    deps = "lj_vm.obj",
     defines = {
         "_CRT_SECURE_NO_WARNINGS",
         "LUA_BUILD_AS_DLL"
@@ -167,26 +173,25 @@ lm:shared_library "luajit/luajit" {
         "!src/lj_init.c",
         "src/lj_*.c",
         "src/lib_*.c",
-        "../../../".. lm.bindir.."/lj_vm.obj",
     },
-    includes={
+    includes = {
         ".",
         "../../../"..lm.bindir
     }
 }
 
 lm:exe "luajit/lua" {
-    rootdir= luajitDir,
+    rootdir = luajitDir,
     bindir = bindir,
-   deps="luajit/luajit",
+    deps = "luajit/luajit",
     defines = {
         "_CRT_SECURE_NO_WARNINGS",
     },
     sources = {
         "src/luajit.c",
         "src/lj_init.c",
     },
-    includes={
+    includes = {
         ".",
         "../../../"..lm.bindir
     }