Commit a5a51006 authored by nanahira's avatar nanahira

support inbuilt lua

parent 74feedee
...@@ -14,6 +14,7 @@ build ...@@ -14,6 +14,7 @@ build
/sqlite3 /sqlite3
/irrklang /irrklang
/irrlicht* /irrlicht*
/lua
# gframe additionals # gframe additionals
/gframe/ygopro.ico /gframe/ygopro.ico
......
...@@ -53,7 +53,12 @@ project "ygopro" ...@@ -53,7 +53,12 @@ project "ygopro"
links { "event_pthreads", "GL", "dl", "pthread" } links { "event_pthreads", "GL", "dl", "pthread" }
configuration "linux" configuration "linux"
includedirs { "../irrlicht_linux/include" } includedirs { "../irrlicht_linux/include" }
links { "lua5.3-c++", "X11", "Xxf86vm" } links { "X11", "Xxf86vm" }
if BUILD_LUA then
links { "lua" }
else
links { "lua5.3-c++" }
end
if USE_IRRKLANG then if USE_IRRKLANG then
links { "IrrKlang" } links { "IrrKlang" }
linkoptions{ "-Wl,-rpath=./" } linkoptions{ "-Wl,-rpath=./" }
......
...@@ -8,6 +8,9 @@ solution "ygo" ...@@ -8,6 +8,9 @@ solution "ygo"
IRRKLANG_PRO = true IRRKLANG_PRO = true
end end
end end
if os.ishost("linux") and os.getenv("YGOPRO_BUILD_LUA") then
BUILD_LUA=true
end
configurations { "Release", "Debug" } configurations { "Release", "Debug" }
if os.getenv("YGOPRO_LUA_SAFE") then if os.getenv("YGOPRO_LUA_SAFE") then
...@@ -98,7 +101,7 @@ end ...@@ -98,7 +101,7 @@ end
if os.ishost("linux") then if os.ishost("linux") then
include "irrlicht_linux" include "irrlicht_linux"
end end
if os.ishost("macosx") then if os.ishost("macosx") or BUILD_LUA then
include "lua" include "lua"
end end
if USE_IRRKLANG then if USE_IRRKLANG 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