summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author cracyc <cracyc@users.noreply.github.com>2017-05-15 11:41:06 -0500
committer GitHub <noreply@github.com>2017-05-15 11:41:06 -0500
commit40e1e3e698b56144de438e7b4e9fa08aa59ea417 (patch)
tree95afee2584a5dec62409257d8d34a439dad738c1 /scripts/src
parente5f3a12e0a377124d4d71050294591e7966676ce (diff)
parent4ebc18aeec6929bd1396daef1289df9821422834 (diff)
Merge pull request #2303 from cracyc/linenoise_new
linenoise work
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/3rdparty.lua13
-rw-r--r--scripts/src/main.lua2
2 files changed, 7 insertions, 8 deletions
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