Commit cd713715 authored by nanahira's avatar nanahira

Merge branch 'master' into server

parents dab1cf07 3111cb98
...@@ -19,6 +19,7 @@ newoption { trigger = "no-build-lua", category = "YGOPro - lua", description = " ...@@ -19,6 +19,7 @@ newoption { trigger = "no-build-lua", category = "YGOPro - lua", description = "
newoption { trigger = "lua-include-dir", category = "YGOPro - lua", description = "", value = "PATH" } newoption { trigger = "lua-include-dir", category = "YGOPro - lua", description = "", value = "PATH" }
newoption { trigger = "lua-lib-dir", category = "YGOPro - lua", description = "", value = "PATH" } newoption { trigger = "lua-lib-dir", category = "YGOPro - lua", description = "", value = "PATH" }
newoption { trigger = "lua-lib-name", category = "YGOPro - lua", description = "", value = "NAME", default = "lua" } newoption { trigger = "lua-lib-name", category = "YGOPro - lua", description = "", value = "NAME", default = "lua" }
newoption { trigger = "lua-deb", category = "YGOPro - lua", description = "" }
newoption { trigger = "build-event", category = "YGOPro - event", description = "" } newoption { trigger = "build-event", category = "YGOPro - event", description = "" }
newoption { trigger = "no-build-event", category = "YGOPro - event", description = "" } newoption { trigger = "no-build-event", category = "YGOPro - event", description = "" }
...@@ -113,6 +114,13 @@ if not BUILD_LUA then ...@@ -113,6 +114,13 @@ if not BUILD_LUA then
LUA_LIB_NAME = GetParam("lua-lib-name") LUA_LIB_NAME = GetParam("lua-lib-name")
end end
if GetParam("lua-deb") then
BUILD_LUA = false
LUA_LIB_DIR = "/usr/lib/x86_64-linux-gnu"
LUA_LIB_NAME = "lua5.3-c++"
LUA_INCLUDE_DIR = "/usr/include/lua5.3"
end
if GetParam("build-event") then if GetParam("build-event") then
BUILD_EVENT = os.istarget("windows") -- only on windows for now BUILD_EVENT = os.istarget("windows") -- only on windows for now
elseif GetParam("no-build-event") then elseif GetParam("no-build-event") then
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment