diff options
author | 2016-02-14 08:16:35 +0100 | |
---|---|---|
committer | 2016-02-14 08:16:35 +0100 | |
commit | 2db49088141b6238e92aecc4c073076a02c73065 (patch) | |
tree | dba4ea354a0dec2d986fd49de943e5f30b81f8a1 /scripts/src/3rdparty.lua | |
parent | 80e8fe80e6354acc7157bd82066e719365642a1b (diff) |
Added lua-zlib, lfs and luv support for LUA, exposed all using luaengine (nw)
Diffstat (limited to 'scripts/src/3rdparty.lua')
-rw-r--r-- | scripts/src/3rdparty.lua | 73 |
1 files changed, 67 insertions, 6 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 16b86dcbe21..ef46f1cab24 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -398,6 +398,8 @@ end configuration { } defines { "LUA_COMPAT_ALL", + "LUA_COMPAT_5_1", + "LUA_COMPAT_5_2", } if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then defines { @@ -458,20 +460,19 @@ links { end -------------------------------------------------- --- sqlite3 lua library objects +-- small lua library objects -------------------------------------------------- -project "lsqlite3" +project "lualibs" uuid "1d84edab-94cf-48fb-83ee-b75bc697660e" kind "StaticLib" - -- options { - -- "ForceCPP", - -- } - configuration { "vs*" } buildoptions { "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data + "/wd4055", -- warning C4055: 'type cast': from data pointer 'void *' to function pointer 'xxx' + "/wd4152", -- warning C4152: nonstandard extension, function/data pointer conversion in expression + "/wd4130", -- warning C4130: '==': logical operation on address of string constant } configuration { } @@ -487,9 +488,69 @@ project "lsqlite3" MAME_DIR .. "3rdparty/lua/src", } end + if _OPTIONS["with-bundled-zlib"] then + includedirs { + MAME_DIR .. "3rdparty/zlib", + } + end files { MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c", + MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c", + MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c", + } + +-------------------------------------------------- +-- luv lua library objects +-------------------------------------------------- + +project "luv" + uuid "d98ec5ca-da2a-4a50-88a2-52061ca53871" + kind "StaticLib" + + if _OPTIONS["targetos"]=="windows" then + defines { + "_WIN32_WINNT=0x0600", + } + end + configuration { "vs*" } + buildoptions { + "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data + } + + configuration { "gmake" } + buildoptions_c { + "-Wno-unused-function", + "-Wno-strict-prototypes", + "-Wno-unused-variable", + "-Wno-maybe-uninitialized", + "-Wno-undef", + } + + configuration { "vs2015" } + buildoptions { + "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used + "/wd4703", -- warning C4703: potentially uninitialized local pointer variable 'xxx' used + } + + configuration { } + defines { + "LUA_COMPAT_ALL", + } + + includedirs { + MAME_DIR .. "3rdparty/lua/src", + MAME_DIR .. "3rdparty/libuv/include", + } + if _OPTIONS["with-bundled-lua"] then + includedirs { + MAME_DIR .. "3rdparty/luv/deps/lua/src", + } + end + + files { + MAME_DIR .. "3rdparty/luv/src/luv.c", + MAME_DIR .. "3rdparty/luv/src/luv.h", } -------------------------------------------------- |