summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--make.lua4
-rw-r--r--make/icon.ico (renamed from icon.ico)bin147878 -> 147878 bytes
-rw-r--r--make/install.lua13
-rw-r--r--make/lua-language-server.rc2
4 files changed, 5 insertions, 14 deletions
diff --git a/make.lua b/make.lua
index 2649cf0c..fdb5c46a 100644
--- a/make.lua
+++ b/make.lua
@@ -8,7 +8,9 @@ if lm.plat == "macos" then
}
end
-lm:import '3rd/bee.lua/make.lua'
+lm:import("3rd/bee.lua/make.lua", {
+ EXE_RESOURCE = "../../make/lua-language-server.rc"
+})
lm.rootdir = '3rd/'
diff --git a/icon.ico b/make/icon.ico
index 6722f87e..6722f87e 100644
--- a/icon.ico
+++ b/make/icon.ico
Binary files differ
diff --git a/make/install.lua b/make/install.lua
index d5b26d7c..5f95e462 100644
--- a/make/install.lua
+++ b/make/install.lua
@@ -13,16 +13,3 @@ fs.create_directories(output)
fs.copy_file(bindir / 'lpeglabel'..dll, output / 'lpeglabel'..dll, true)
fs.copy_file(bindir / 'bee'..dll, output / 'bee'..dll, true)
fs.copy_file(bindir / 'lua'..exe, output / 'lua-language-server'..exe, true)
-
-if platform == 'msvc' then
- fs.copy_file(bindir / 'lua54'..dll, output / 'lua54'..dll, true)
- require 'msvc'.copy_crtdll('x64', output)
-
- local process = assert(sp.spawn {
- bindir / 'rcedit.exe',
- output / 'lua-language-server.exe',
- '--set-icon',
- CWD / 'icon.ico'
- })
- assert(process:wait())
-end
diff --git a/make/lua-language-server.rc b/make/lua-language-server.rc
new file mode 100644
index 00000000..dc260412
--- /dev/null
+++ b/make/lua-language-server.rc
@@ -0,0 +1,2 @@
+#include "Windows.h"
+10086 ICON "make/icon.ico"