summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2017-01-01 08:32:39 -0500
committer GitHub <noreply@github.com>2017-01-01 08:32:39 -0500
commite7bc92d9301e4da895a88ccce074754f7a39d387 (patch)
treebf0b5e52a25cbe3ac1508bfefe721014f9e9befc /scripts
parent6362060a89be270befa6fe4c880fa7f8041afb26 (diff)
parentd863b6e90ba77608c20af9d9698f9188ee69fe8f (diff)
Merge pull request #1897 from npwoods/introduce_utf8proc
Introduced utf8proc and created wrapper code to expose a prettier API
Diffstat (limited to 'scripts')
-rw-r--r--scripts/src/3rdparty.lua39
-rw-r--r--scripts/src/main.lua1
-rw-r--r--scripts/src/tools.lua15
3 files changed, 55 insertions, 0 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 8bdc39eddb0..211cd7c5fd8 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -1585,3 +1585,42 @@ project "linenoise-ng"
MAME_DIR .. "3rdparty/linenoise-ng/src/wcwidth.cpp",
}
end
+
+
+--------------------------------------------------
+-- utf8proc library objects
+--------------------------------------------------
+
+if not _OPTIONS["with-system-utf8proc"] then
+project "utf8proc"
+ uuid "1f881f09-0395-4483-ac37-2935fb092187"
+ kind "StaticLib"
+
+ defines {
+ "UTF8PROC_DLLEXPORT="
+ }
+
+ configuration "Debug"
+ defines {
+ "verbose=-1",
+ }
+
+ configuration { "gmake or ninja" }
+ buildoptions_c {
+ "-Wno-strict-prototypes",
+ }
+
+ configuration { }
+ defines {
+ "ZLIB_CONST",
+ }
+
+ files {
+ MAME_DIR .. "3rdparty/utf8proc/utf8proc.c"
+ }
+else
+links {
+ ext_lib("utf8proc"),
+}
+end
+
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index a78965a52b2..22bef465c18 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -276,6 +276,7 @@ end
links {
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
if (STANDALONE~=true) then
links {
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 0d784113b82..54bff0efb43 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -31,6 +31,7 @@ links {
"7z",
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -73,6 +74,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -118,6 +120,7 @@ links {
ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -161,6 +164,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -206,6 +210,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -252,6 +257,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -296,6 +302,7 @@ links {
ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -336,6 +343,7 @@ links {
ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -376,6 +384,7 @@ links {
ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -418,6 +427,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -458,6 +468,7 @@ links {
ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -501,6 +512,7 @@ links {
"netlist",
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -585,6 +597,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -630,6 +643,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {
@@ -675,6 +689,7 @@ links {
"ocore_" .. _OPTIONS["osd"],
ext_lib("zlib"),
ext_lib("flac"),
+ ext_lib("utf8proc"),
}
includedirs {