diff options
author | 2016-11-07 16:12:06 +0100 | |
---|---|---|
committer | 2016-11-07 16:12:06 +0100 | |
commit | cf4a8b9e0342e42f5c4e4f38e66b3cd96dd3fcc5 (patch) | |
tree | 1b5db9ba22e47ed67e0bf7f0534334af68d0b613 /scripts | |
parent | a60731323599ab4d624adba7a73333037670430d (diff) |
resurected sqlite3 and lsqlite3 (nw)
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/extlib.lua | 6 | ||||
-rw-r--r-- | scripts/src/3rdparty.lua | 34 | ||||
-rw-r--r-- | scripts/src/main.lua | 1 |
3 files changed, 41 insertions, 0 deletions
diff --git a/scripts/extlib.lua b/scripts/extlib.lua index 3202832e504..a3949e3447b 100644 --- a/scripts/extlib.lua +++ b/scripts/extlib.lua @@ -10,6 +10,7 @@ local extlibs = { zlib = { "z", "3rdparty/zlib" }, jpeg = { "jpeg", "3rdparty/libjpeg" }, flac = { "FLAC", "3rdparty/libflac/include" }, + sqlite3 = { "sqlite3", "3rdparty/sqlite3" }, portmidi = { "portmidi", "3rdparty/portmidi/pm_common" }, portaudio = { "portaudio", "3rdparty/portaudio/include" }, lua = { "lua", "3rdparty/lua/src" }, @@ -37,6 +38,11 @@ newoption { } newoption { + trigger = 'with-system-sqlite3', + description = 'Use system SQLite library', +} + +newoption { trigger = 'with-system-portmidi', description = 'Use system PortMidi library', } diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 9925f0821dd..fc9e157635b 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -560,14 +560,48 @@ project "lualibs" includedirs { ext_includedir("lua"), ext_includedir("zlib"), + ext_includedir("sqlite3"), } files { + MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c", MAME_DIR .. "3rdparty/lua-zlib/lua_zlib.c", MAME_DIR .. "3rdparty/luafilesystem/src/lfs.c", MAME_DIR .. "3rdparty/lua-linenoise/linenoise.c", } +-------------------------------------------------- +-- SQLite3 library objects +-------------------------------------------------- + +if not _OPTIONS["with-system-sqlite3"] then +project "sqlite3" + uuid "5cb3d495-57ed-461c-81e5-80dc0857517d" + kind "StaticLib" + + configuration { "gmake" } + buildoptions_c { + "-Wno-discarded-qualifiers", + "-Wno-unused-but-set-variable", + "-Wno-bad-function-cast", + "-Wno-undef", + } +if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then + buildoptions_c { + "-Wno-incompatible-pointer-types-discards-qualifiers", + } +end + configuration { } + + files { + MAME_DIR .. "3rdparty/sqlite3/sqlite3.c", + } +else +links { + ext_lib("sqlite3"), +} +end + end -------------------------------------------------- -- portmidi library objects diff --git a/scripts/src/main.lua b/scripts/src/main.lua index bfa5659e8af..e231ffe065b 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -239,6 +239,7 @@ end links { ext_lib("zlib"), ext_lib("flac"), + ext_lib("sqlite3"), } if _OPTIONS["NO_USE_MIDI"]~="1" then |