summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2017-12-24 15:03:04 +1100
committer Vas Crabb <vas@vastheman.com>2017-12-24 15:03:04 +1100
commit25f84e3bf06c27fe8bde62117a6458312f2c1ea1 (patch)
treea3b73dd7c982bfa9b420b0c456a90741e3e22c7a /scripts
parentef82d89e3a7684008a9706767ba87a6100443952 (diff)
srcclean and manual cleanups (nw)
please people, remember to keep source UTF-8 and if you're committing on behalf of others, clean up indents to meet MAME conventions anyone can run srcclean over a submission and see what will get hit
Diffstat (limited to 'scripts')
-rw-r--r--scripts/font/README.md4
-rw-r--r--scripts/src/3rdparty.lua2
-rw-r--r--scripts/target/mame/mess.lua7
3 files changed, 6 insertions, 7 deletions
diff --git a/scripts/font/README.md b/scripts/font/README.md
index 76046e8fcab..36ed4bbac77 100644
--- a/scripts/font/README.md
+++ b/scripts/font/README.md
@@ -41,8 +41,8 @@ Development and user discussions happen on the [noto-font Google Group](https://
## Special Note on Droid Fonts
-The Droid fonts are superseded by Noto. Noto began as Droid, and since renaming all updates are made to the Noto fonts.
-Today Noto gives better support to all languages covered by Droid fonts, with more characters and fewer bugs, and covers many more languages.
+The Droid fonts are superseded by Noto. Noto began as Droid, and since renaming all updates are made to the Noto fonts.
+Today Noto gives better support to all languages covered by Droid fonts, with more characters and fewer bugs, and covers many more languages.
Both Android and ChromeOS have switched to Noto, and we strongly recommend everyone to replace Droid with Noto.
Similarly, the Droid Sans Fallback font is superseded by Noto Sans CJK, available from [noto-cjk](https://github.com/googlei18n/noto-cjk).
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 2670b723b02..5a9a52c849f 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -786,7 +786,7 @@ project "bx"
}
files {
- MAME_DIR .. "3rdparty/bx/src/allocator.cpp",
+ MAME_DIR .. "3rdparty/bx/src/allocator.cpp",
MAME_DIR .. "3rdparty/bx/src/bx.cpp",
MAME_DIR .. "3rdparty/bx/src/commandline.cpp",
MAME_DIR .. "3rdparty/bx/src/crtnone.cpp",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 2e78d8fe846..d4736206203 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -1370,7 +1370,6 @@ files {
MAME_DIR .. "src/mame/machine/apricotkb.cpp",
MAME_DIR .. "src/mame/machine/apricotkb.h",
MAME_DIR .. "src/mame/drivers/victor9k.cpp",
--- MAME_DIR .. "src/mame/includes/victor9k.h",
MAME_DIR .. "src/mame/machine/victor9k_kb.cpp",
MAME_DIR .. "src/mame/machine/victor9k_kb.h",
MAME_DIR .. "src/mame/machine/victor9k_fdc.cpp",
@@ -2141,8 +2140,8 @@ files {
MAME_DIR .. "src/mame/drivers/hp48.cpp",
MAME_DIR .. "src/mame/includes/hp48.h",
MAME_DIR .. "src/mame/machine/hp48.cpp",
- MAME_DIR .. "src/mame/machine/hp9845_printer.cpp",
- MAME_DIR .. "src/mame/machine/hp9845_printer.h",
+ MAME_DIR .. "src/mame/machine/hp9845_printer.cpp",
+ MAME_DIR .. "src/mame/machine/hp9845_printer.h",
MAME_DIR .. "src/mame/video/hp48.cpp",
MAME_DIR .. "src/mame/drivers/hp49gp.cpp",
MAME_DIR .. "src/mame/drivers/hp9845.cpp",
@@ -2681,7 +2680,7 @@ files {
MAME_DIR .. "src/mame/drivers/prodigy.cpp",
MAME_DIR .. "src/mame/machine/nl_prodigy.cpp",
MAME_DIR .. "src/mame/machine/nl_prodigy.h",
- }
+}
includedirs {
MAME_DIR .. "3rdparty/rapidjson/include",
}