diff options
author | 2021-10-25 17:03:35 +1100 | |
---|---|---|
committer | 2021-10-25 17:03:35 +1100 | |
commit | 3026bb4bba89f623c0beb19b68862684b74bf550 (patch) | |
tree | ed3f22b83aeeb2bcbeea81e929635be513a07acd | |
parent | f92330333712531f985ed4fe9724a61384dcd6bd (diff) | |
parent | 27599c115e6fbb20042b113bb2e29b47bb027fce (diff) |
Merge remote-tracking branch 'mainline/release0237' into master
-rw-r--r-- | hash/apple2_flop_clcracked.xml | 2 | ||||
-rw-r--r-- | hash/apple2gs_flop_clcracked.xml | 4 | ||||
-rw-r--r-- | makefile | 5 | ||||
-rw-r--r-- | plugins/autofire/init.lua | 2 | ||||
-rw-r--r-- | plugins/cheat/init.lua | 2 | ||||
-rw-r--r-- | plugins/cheatfind/init.lua | 2 | ||||
-rw-r--r-- | plugins/console/init.lua | 2 | ||||
-rw-r--r-- | plugins/data/init.lua | 2 | ||||
-rw-r--r-- | plugins/discord/init.lua | 2 | ||||
-rw-r--r-- | plugins/dummy/init.lua | 2 | ||||
-rw-r--r-- | plugins/gdbstub/init.lua | 2 | ||||
-rw-r--r-- | plugins/hiscore/init.lua | 4 | ||||
-rw-r--r-- | plugins/inputmacro/init.lua | 2 | ||||
-rw-r--r-- | plugins/inputmacro/inputmacro_menu.lua | 4 | ||||
-rw-r--r-- | plugins/inputmacro/inputmacro_persist.lua | 4 | ||||
-rw-r--r-- | plugins/layout/init.lua | 2 | ||||
-rw-r--r-- | plugins/portname/init.lua | 2 | ||||
-rw-r--r-- | plugins/timer/init.lua | 2 |
18 files changed, 28 insertions, 19 deletions
diff --git a/hash/apple2_flop_clcracked.xml b/hash/apple2_flop_clcracked.xml index d2d820dd043..9bc531a6c43 100644 --- a/hash/apple2_flop_clcracked.xml +++ b/hash/apple2_flop_clcracked.xml @@ -45727,7 +45727,7 @@ license:CC0 </part> </software> - <software name="wntgames"> + <software name="tgwinter"> <description>The Games: Winter Edition (cleanly cracked)</description> <year>1985</year> <publisher>Epyx</publisher> diff --git a/hash/apple2gs_flop_clcracked.xml b/hash/apple2gs_flop_clcracked.xml index cfb67644ba0..9f3f9cb7cf4 100644 --- a/hash/apple2gs_flop_clcracked.xml +++ b/hash/apple2gs_flop_clcracked.xml @@ -1586,13 +1586,13 @@ license:CC0 <part name="flop1" interface="floppy_3_5"> <feature name="part_id" value="Disk 1"/> - <dataarea name="flop" size="1296282"> + <dataarea name="flop" size="819264"> <rom name="space quest ii - vohual's revenge iigs - disk 1 (trex crack).2mg" size="819264" crc="4d463103" sha1="50df27602f17af84e2a2e4e3b221bd87aa98dad0"/> </dataarea> </part> <part name="flop2" interface="floppy_3_5"> <feature name="part_id" value="Disk 2"/> - <dataarea name="flop" size="1296282"> + <dataarea name="flop" size="819264"> <rom name="space quest ii - vohual's revenge iigs - disk 2 (trex crack).2mg" size="819264" crc="809875fc" sha1="d90165d8c51d7d54d8a17c4082e8688048950389"/> </dataarea> </part> @@ -1712,8 +1712,9 @@ genieclean: clean: genieclean @echo Cleaning... - -@rm -rf $(BUILDDIR) - -@rm -rf 3rdparty/bgfx/.build + -$(SILENT)rm -f language/*/*.mo + -$(SILENT)rm -rf $(BUILDDIR) + -$(SILENT)rm -rf 3rdparty/bgfx/.build GEN_FOLDERS := $(GENDIR)/$(TARGET)/layout/ $(GENDIR)/$(TARGET)/$(SUBTARGET_FULL)/ $(GENDIR)/mame/drivers/ $(GENDIR)/mame/machine/ diff --git a/plugins/autofire/init.lua b/plugins/autofire/init.lua index d14533dc53b..57ea3d4bb27 100644 --- a/plugins/autofire/init.lua +++ b/plugins/autofire/init.lua @@ -4,7 +4,7 @@ local exports = { name = 'autofire', version = '0.0.4', description = 'Autofire plugin', - license = 'The BSD 3-Clause License', + license = 'BSD-3-Clause', author = { name = 'Jack Li' } } local autofire = exports diff --git a/plugins/cheat/init.lua b/plugins/cheat/init.lua index e0ae0c058ab..e5fc2245922 100644 --- a/plugins/cheat/init.lua +++ b/plugins/cheat/init.lua @@ -68,7 +68,7 @@ local exports = {} exports.name = "cheat" exports.version = "0.0.1" exports.description = "Cheat plugin" -exports.license = "The BSD 3-Clause License" +exports.license = "BSD-3-Clause" exports.author = { name = "Carl" } local cheat = exports diff --git a/plugins/cheatfind/init.lua b/plugins/cheatfind/init.lua index b9ff9ce3403..62b468ce920 100644 --- a/plugins/cheatfind/init.lua +++ b/plugins/cheatfind/init.lua @@ -5,7 +5,7 @@ local exports = {} exports.name = "cheatfind" exports.version = "0.0.1" exports.description = "Cheat finder helper library" -exports.license = "The BSD 3-Clause License" +exports.license = "BSD-3-Clause" exports.author = { name = "Carl" } local cheatfind = exports diff --git a/plugins/console/init.lua b/plugins/console/init.lua index de8a5844a68..cec818cc329 100644 --- a/plugins/console/init.lua +++ b/plugins/console/init.lua @@ -5,7 +5,7 @@ local exports = {} exports.name = "console" exports.version = "0.0.1" exports.description = "Console plugin" -exports.license = "The BSD 3-Clause License" +exports.license = "BSD-3-Clause" exports.author = { name = "Carl" } local console = exports diff --git a/plugins/data/init.lua b/plugins/data/init.lua index 4ef3675968f..5ec08cbec3c 100644 --- a/plugins/data/init.lua +++ b/plugins/data/init.lua @@ -8,7 +8,7 @@ local exports = {} exports.name = "data" exports.version = "0.0.1" exports.description = "Data plugin" -exports.license = "The BSD 3-Clause License" +exports.license = "BSD-3-Clause" exports.author = { name = "Carl" } local data = exports diff --git a/plugins/discord/init.lua b/plugins/discord/init.lua index f95030f1c46..b6e25d08aa7 100644 --- a/plugins/discord/init.lua +++ b/plugins/discord/init.lua @@ -4,7 +4,7 @@ local exports = {} exports.name = "discord" exports.version = "0.0.1" exports.description = "Discord presence" -exports.license = "The BSD 3-Clause License" +exports.license = "BSD-3-Clause" exports.author = { name = "Carl" } local discord = exports diff --git a/plugins/dummy/init.lua b/plugins/dummy/init.lua index 026e29397c1..45f6d78d570 100644 --- a/plugins/dummy/init.lua +++ b/plugins/dummy/init.lua @@ -4,7 +4,7 @@ local exports = { name = "dummy", version = "0.0.1", description = "A dummy example", - license = "The BSD 3-Clause License", + license = "BSD-3-Clause", author = { name = "Miodrag Milanovic" }} local dummy = exports diff --git a/plugins/gdbstub/init.lua b/plugins/gdbstub/init.lua index f7d4ceee6ba..8a28a68d8cc 100644 --- a/plugins/gdbstub/init.lua +++ b/plugins/gdbstub/init.lua @@ -4,7 +4,7 @@ local exports = {} exports.name = "gdbstub" exports.version = "0.0.1" exports.description = "GDB stub plugin" -exports.license = "The BSD 3-Clause License" +exports.license = "BSD-3-Clause" exports.author = { name = "Carl" } local gdbstub = exports diff --git a/plugins/hiscore/init.lua b/plugins/hiscore/init.lua index 0865caa2721..4ec94c9a590 100644 --- a/plugins/hiscore/init.lua +++ b/plugins/hiscore/init.lua @@ -1,5 +1,5 @@ -- hiscore.lua --- by borgar@borgar.net, WTFPL license +-- by borgar@borgar.net, CC0 license -- -- This uses MAME's built-in Lua scripting to implement -- high-score saving with hiscore.dat infom just as older @@ -9,7 +9,7 @@ local exports = { name = 'hiscore', version = '1.0.0', description = 'Hiscore', - license = 'WTFPL license', + license = 'CC0', author = { name = 'borgar@borgar.net' } } local hiscore = exports diff --git a/plugins/inputmacro/init.lua b/plugins/inputmacro/init.lua index ef88efeadcd..99e3d61f1d4 100644 --- a/plugins/inputmacro/init.lua +++ b/plugins/inputmacro/init.lua @@ -4,7 +4,7 @@ local exports = { name = 'inputmacro', version = '0.0.1', description = 'Input macro plugin', - license = 'The BSD 3-Clause License', + license = 'BSD-3-Clause', author = { name = 'Vas Crabb' } } diff --git a/plugins/inputmacro/inputmacro_menu.lua b/plugins/inputmacro/inputmacro_menu.lua index afb2071996b..7c03d5b95a7 100644 --- a/plugins/inputmacro/inputmacro_menu.lua +++ b/plugins/inputmacro/inputmacro_menu.lua @@ -1,3 +1,7 @@ +-- license:BSD-3-Clause +-- copyright-holders:Vas Crabb + + -- Constants local MENU_TYPES = { MACROS = 0, ADD = 1, EDIT = 2, INPUT = 3 } diff --git a/plugins/inputmacro/inputmacro_persist.lua b/plugins/inputmacro/inputmacro_persist.lua index 04d310faeef..9c9e9322eed 100644 --- a/plugins/inputmacro/inputmacro_persist.lua +++ b/plugins/inputmacro/inputmacro_persist.lua @@ -1,3 +1,7 @@ +-- license:BSD-3-Clause +-- copyright-holders:Vas Crabb + + -- Helpers local function settings_path() diff --git a/plugins/layout/init.lua b/plugins/layout/init.lua index 55cb433baf2..45b810c86b7 100644 --- a/plugins/layout/init.lua +++ b/plugins/layout/init.lua @@ -6,7 +6,7 @@ local exports = {} exports.name = "layout" exports.version = "0.0.1" exports.description = "Layout helper plugin" -exports.license = "The BSD 3-Clause License" +exports.license = "BSD-3-Clause" exports.author = { name = "Carl" } local layout = exports diff --git a/plugins/portname/init.lua b/plugins/portname/init.lua index 24cdc50facf..88cc0d20898 100644 --- a/plugins/portname/init.lua +++ b/plugins/portname/init.lua @@ -21,7 +21,7 @@ local exports = {} exports.name = "portname" exports.version = "0.0.1" exports.description = "IOPort name/translation plugin" -exports.license = "The BSD 3-Clause License" +exports.license = "BSD-3-Clause" exports.author = { name = "Carl" } local portname = exports diff --git a/plugins/timer/init.lua b/plugins/timer/init.lua index eb61f85bf84..9457c1fc038 100644 --- a/plugins/timer/init.lua +++ b/plugins/timer/init.lua @@ -6,7 +6,7 @@ local exports = {} exports.name = "timer" exports.version = "0.0.2" exports.description = "Game play timer" -exports.license = "The BSD 3-Clause License" +exports.license = "BSD-3-Clause" exports.author = { name = "Carl" } local timer = exports |