diff options
| author | 2017-01-02 04:15:37 +0100 | |
|---|---|---|
| committer | 2017-01-02 04:15:37 +0100 | |
| commit | 358271ab3f85db088cc6bc858896813ced1461f1 (patch) | |
| tree | 7320b0fe1b73dd53359d5e0e44dd8108ad76d2f5 /scripts | |
| parent | daf88c60809fbc706fde1cfd5855c8ea52969fa3 (diff) | |
| parent | 8f6967671743554ebae38f8850e328e6d6ef884b (diff) | |
Merge branch 'master' into c148_rewrite
# Conflicts:
# hash/ibm5150.xml
# src/mame/drivers/gsword.cpp
# src/mame/drivers/rm380z.cpp
# src/mame/drivers/rohga.cpp
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/src/3rdparty.lua | 39 | ||||
| -rw-r--r-- | scripts/src/main.lua | 1 | ||||
| -rw-r--r-- | scripts/src/tools.lua | 15 | ||||
| -rw-r--r-- | scripts/target/mame/arcade.lua | 5 |
4 files changed, 57 insertions, 3 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 { diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index a319dc7548d..790b13fab19 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -3554,8 +3554,8 @@ files { MAME_DIR .. "src/mame/video/bublbobl.cpp", MAME_DIR .. "src/mame/drivers/buggychl.cpp", MAME_DIR .. "src/mame/includes/buggychl.h", - MAME_DIR .. "src/mame/machine/buggychl.cpp", - MAME_DIR .. "src/mame/machine/buggychl.h", + MAME_DIR .. "src/mame/machine/taito68705interface.cpp", + MAME_DIR .. "src/mame/machine/taito68705interface.h", MAME_DIR .. "src/mame/video/buggychl.cpp", MAME_DIR .. "src/mame/drivers/capr1.cpp", MAME_DIR .. "src/mame/drivers/caprcyc.cpp", @@ -3616,7 +3616,6 @@ files { MAME_DIR .. "src/mame/drivers/lgp.cpp", MAME_DIR .. "src/mame/drivers/lkage.cpp", MAME_DIR .. "src/mame/includes/lkage.h", - MAME_DIR .. "src/mame/machine/lkage.cpp", MAME_DIR .. "src/mame/video/lkage.cpp", MAME_DIR .. "src/mame/drivers/lsasquad.cpp", MAME_DIR .. "src/mame/includes/lsasquad.h", |
