From 4ebc18aeec6929bd1396daef1289df9821422834 Mon Sep 17 00:00:00 2001 From: cracyc Date: Thu, 11 May 2017 17:28:14 -0500 Subject: linenoise: replace linenoise-ng with a different port that is simpler and uses a different UTF8 parser [Carl] plugins/console: better completions [Carl] --- scripts/src/3rdparty.lua | 13 ++++++------- scripts/src/main.lua | 2 +- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'scripts/src') diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 1e56f4b9bdb..703eb242f00 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -574,7 +574,7 @@ project "lualibs" } if (_OPTIONS["osd"] ~= "uwp") then includedirs { - MAME_DIR .. "3rdparty/linenoise-ng/include", + MAME_DIR .. "3rdparty/linenoise", } end includedirs { @@ -1631,10 +1631,10 @@ end end -------------------------------------------------- --- linenoise-ng library +-- linenoise library -------------------------------------------------- if (_OPTIONS["osd"] ~= "uwp") then -project "linenoise-ng" +project "linenoise" uuid "7320ffc8-2748-4add-8864-ae29b72a8511" kind (LIBTYPE) @@ -1648,13 +1648,12 @@ project "linenoise-ng" configuration { } includedirs { - MAME_DIR .. "3rdparty/linenoise-ng/include", + MAME_DIR .. "3rdparty/linenoise", } files { - MAME_DIR .. "3rdparty/linenoise-ng/src/ConvertUTF.cpp", - MAME_DIR .. "3rdparty/linenoise-ng/src/linenoise.cpp", - MAME_DIR .. "3rdparty/linenoise-ng/src/wcwidth.cpp", + MAME_DIR .. "3rdparty/linenoise/utf8.c", + MAME_DIR .. "3rdparty/linenoise/linenoise.c", } end diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 3c7429b935e..55976110628 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -269,7 +269,7 @@ if (STANDALONE~=true) then } if (_OPTIONS["osd"] ~= "uwp") then links { - "linenoise-ng", + "linenoise", } end end -- cgit v1.2.3