Skip to content
Snippets Groups Projects
Commit 55ec1070 authored by actboy168's avatar actboy168
Browse files

去掉一些警告

parent cb85a216
No related branches found
No related tags found
No related merge requests found
Subproject commit 68a7b6c46283f1f6121325f863308396548ed8d1 Subproject commit b4f80764eb5a5addbf7d9806f9af210a33ca0a21
Subproject commit 952954f6ed227971f457f2d148dd98f6956c8d66 Subproject commit 882f22a0e47acde91ebe314943d77607e6dc5ca1
local lm = require 'luamake' local lm = require 'luamake'
local platform = require "bee.platform" local platform = require "bee.platform"
...@@ -7,41 +6,24 @@ lm:import '3rd/bee.lua/make.lua' ...@@ -7,41 +6,24 @@ lm:import '3rd/bee.lua/make.lua'
lm.arch = 'x64' lm.arch = 'x64'
lm.rootdir = '3rd/' lm.rootdir = '3rd/'
local lua = 'lua54'
local includes = nil
local lpeglabel_ldflags = '/EXPORT:luaopen_lpeglabel'
if lm.plat == 'macos' then
lua = 'lua'
includes = {'bee.lua/3rd/lua/src'}
lpeglabel_ldflags = nil
elseif lm.plat == 'linux' then
lua = 'lua'
includes = {'bee.lua/3rd/lua/src'}
lpeglabel_ldflags = nil
end
lm:shared_library 'lni' { lm:shared_library 'lni' {
deps = lua, deps = platform.OS == "Windows" and "lua54" or "lua",
sources = { sources = {
'lni/src/main.cpp', 'lni/src/main.cpp',
}, },
includes = includes,
links = { links = {
platform.OS == "Linux" and "stdc++", platform.OS == "Linux" and "stdc++",
}, },
} }
lm:shared_library 'lpeglabel' { lm:shared_library 'lpeglabel' {
deps = lua, deps = platform.OS == "Windows" and "lua54" or "lua",
sources = 'lpeglabel/*.c', sources = 'lpeglabel/*.c',
ldflags = lpeglabel_ldflags, undefs = "NDEBUG",
includes = includes ldflags = platform.OS == "Windows" and "/EXPORT:luaopen_lpeglabel",
} }
local rcedit = nil if platform.OS == "Windows" then
if lm.plat ~= 'macos' and lm.plat ~= 'linux' then
rcedit = 'rcedit'
lm:executable 'rcedit' { lm:executable 'rcedit' {
sources = 'rcedit/src/*.cc', sources = 'rcedit/src/*.cc',
defines = { defines = {
...@@ -62,7 +44,7 @@ lm:build 'install' { ...@@ -62,7 +44,7 @@ lm:build 'install' {
'lni', 'lni',
'lpeglabel', 'lpeglabel',
'bee', 'bee',
rcedit platform.OS == "Windows" and "rcedit"
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment