From d8a0908e2ceff54e54379a7b36189eedd29f2361 Mon Sep 17 00:00:00 2001
From: unknown <sumnekosun@intranet.123u.com>
Date: Tue, 2 Apr 2019 15:26:44 +0800
Subject: =?UTF-8?q?=E7=BC=96=E8=AF=91=E4=B8=BA64=E4=BD=8D=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 3rd/bee.lua      |  2 +-
 3rd/luamake      |  2 +-
 make.lua         | 29 +++++++++++++++++++----------
 make/install.lua |  7 +++----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/3rd/bee.lua b/3rd/bee.lua
index b9b8cadf..7b3a80fe 160000
--- a/3rd/bee.lua
+++ b/3rd/bee.lua
@@ -1 +1 @@
-Subproject commit b9b8cadf20e8510728c7b275d94150c5cac7eb62
+Subproject commit 7b3a80fecb67323312719cae13c18bdf713c5547
diff --git a/3rd/luamake b/3rd/luamake
index fe21c009..24f71957 160000
--- a/3rd/luamake
+++ b/3rd/luamake
@@ -1 +1 @@
-Subproject commit fe21c0092f2332560ea2c1dc1b5666d5ff8cb6b3
+Subproject commit 24f719573092ffd1acf8e267787ed47a26d4e6ab
diff --git a/make.lua b/make.lua
index aee8deeb..87de9334 100644
--- a/make.lua
+++ b/make.lua
@@ -1,15 +1,25 @@
 local lm = require 'luamake'
 
-lm:lua_library 'lni' {
-    sources = '3rd/lni/src/*.cpp'
+lm:import '3rd/bee.lua/make.lua'
+
+lm.arch = 'x64'
+lm.rootdir = '3rd/'
+
+lm:shared_library 'lni' {
+    deps = 'lua54',
+    sources = {
+        'lni/src/main.cpp',
+    }
 }
 
-lm:lua_library 'lpeglabel' {
-    sources = '3rd/lpeglabel/*.c'
+lm:shared_library 'lpeglabel' {
+    deps = 'lua54',
+    sources = 'lpeglabel/*.c',
+    ldflags = '/EXPORT:luaopen_lpeglabel'
 }
 
 lm:executable 'rcedit' {
-    sources = '3rd/rcedit/src/*.cc',
+    sources = 'rcedit/src/*.cc',
     defines = {
         '_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING'
     },
@@ -20,11 +30,6 @@ lm:executable 'rcedit' {
     }
 }
 
-lm:build 'bee' {
-    '$luamake', '-C', '3rd/bee.lua',
-    pool = 'console'
-}
-
 lm:build 'install' {
     '$luamake', 'lua', 'make/install.lua',
     deps = {
@@ -34,3 +39,7 @@ lm:build 'install' {
         'rcedit'
     }
 }
+
+lm:default {
+    'install'
+}
diff --git a/make/install.lua b/make/install.lua
index 910dab9e..448c266f 100644
--- a/make/install.lua
+++ b/make/install.lua
@@ -5,14 +5,13 @@ local CWD = fs.current_path()
 
 local output = CWD / 'server' / 'bin'
 local bindir = CWD / 'build' / 'msvc' / 'bin'
-local beedir = CWD / '3rd' / 'bee.lua' / 'bin' / 'msvc_x86_release'
 
 fs.create_directories(output)
 fs.copy_file(bindir / 'lni.dll', output / 'lni.dll', true)
 fs.copy_file(bindir / 'lpeglabel.dll', output / 'lpeglabel.dll', true)
-fs.copy_file(beedir / 'bee.dll', output / 'bee.dll', true)
-fs.copy_file(beedir / 'lua54.dll', output / 'lua54.dll', true)
-fs.copy_file(beedir / 'lua.exe', output / 'lua-language-server.exe', true)
+fs.copy_file(bindir / 'bee.dll', output / 'bee.dll', true)
+fs.copy_file(bindir / 'lua54.dll', output / 'lua54.dll', true)
+fs.copy_file(bindir / 'lua.exe', output / 'lua-language-server.exe', true)
 
 
 local process = assert(sp.spawn {
-- 
cgit v1.2.3