diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/genie.lua | 34 | ||||
-rw-r--r-- | scripts/src/bus.lua | 24 | ||||
-rw-r--r-- | scripts/target/mame/arcade.lua | 6 |
3 files changed, 41 insertions, 23 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index f9307359ba1..9c02cca4b45 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -35,33 +35,37 @@ end function str_to_version(str) local val = 0 - if (str == nil or str == '') then + if not str then return val end - local cnt = 10000 - for word in string.gmatch(str, '([^.]+)') do - if(tonumber(word) == nil) then + local scale = 10000 + for word, sep in str:gmatch('([^.-]+)([.-]?)') do + local part = tonumber(word) + if not part then + return val + end + val = val + tonumber(word) * scale + scale = scale // 100 + if (scale == 0) or (sep ~= '.') then return val end - val = val + tonumber(word) * cnt - cnt = cnt / 100 end return val end function findfunction(x) assert(type(x) == "string") - local f=_G + local f = _G for v in x:gmatch("[^%.]+") do - if type(f) ~= "table" then - return nil, "looking for '"..v.."' expected table, not "..type(f) - end - f=f[v] + if type(f) ~= "table" then + return nil, "looking for '" .. v .. "' expected table, not " .. type(f) + end + f = f[v] end if type(f) == "function" then - return f + return f else - return nil, "expected function, not "..type(f) + return nil, "expected function, not " .. type(f) end end @@ -1098,8 +1102,8 @@ end end if version >= 120000 then buildoptions { - "-Wno-maybe-uninitialized", - "-Wno-uninitialized", -- netlist + "-Wno-error=maybe-uninitialized", + "-Wno-error=uninitialized", -- netlist } end end diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua index 3a97d6e7c52..7e87a80393b 100644 --- a/scripts/src/bus.lua +++ b/scripts/src/bus.lua @@ -551,6 +551,8 @@ if (BUSES["BBC_INTERNAL"]~=null) then MAME_DIR .. "src/devices/bus/bbc/internal/cumana68k.h", MAME_DIR .. "src/devices/bus/bbc/internal/integrab.cpp", MAME_DIR .. "src/devices/bus/bbc/internal/integrab.h", + MAME_DIR .. "src/devices/bus/bbc/internal/memex.cpp", + MAME_DIR .. "src/devices/bus/bbc/internal/memex.h", MAME_DIR .. "src/devices/bus/bbc/internal/morleyaa.cpp", MAME_DIR .. "src/devices/bus/bbc/internal/morleyaa.h", MAME_DIR .. "src/devices/bus/bbc/internal/overlay.cpp", @@ -2088,22 +2090,32 @@ if (BUSES["RC2014"]~=null) then files { MAME_DIR .. "src/devices/bus/rc2014/rc2014.cpp", MAME_DIR .. "src/devices/bus/rc2014/rc2014.h", - MAME_DIR .. "src/devices/bus/rc2014/modules.cpp", - MAME_DIR .. "src/devices/bus/rc2014/modules.h", - MAME_DIR .. "src/devices/bus/rc2014/z80cpu.cpp", - MAME_DIR .. "src/devices/bus/rc2014/z80cpu.h", + MAME_DIR .. "src/devices/bus/rc2014/cf.cpp", + MAME_DIR .. "src/devices/bus/rc2014/cf.h", MAME_DIR .. "src/devices/bus/rc2014/clock.cpp", MAME_DIR .. "src/devices/bus/rc2014/clock.h", + MAME_DIR .. "src/devices/bus/rc2014/fdc.cpp", + MAME_DIR .. "src/devices/bus/rc2014/fdc.h", + MAME_DIR .. "src/devices/bus/rc2014/ide.cpp", + MAME_DIR .. "src/devices/bus/rc2014/ide.h", + MAME_DIR .. "src/devices/bus/rc2014/micro.cpp", + MAME_DIR .. "src/devices/bus/rc2014/micro.h", + MAME_DIR .. "src/devices/bus/rc2014/modules.cpp", + MAME_DIR .. "src/devices/bus/rc2014/modules.h", MAME_DIR .. "src/devices/bus/rc2014/ram.cpp", MAME_DIR .. "src/devices/bus/rc2014/ram.h", MAME_DIR .. "src/devices/bus/rc2014/rom.cpp", MAME_DIR .. "src/devices/bus/rc2014/rom.h", MAME_DIR .. "src/devices/bus/rc2014/romram.cpp", MAME_DIR .. "src/devices/bus/rc2014/romram.h", + MAME_DIR .. "src/devices/bus/rc2014/rtc.cpp", + MAME_DIR .. "src/devices/bus/rc2014/rtc.h", MAME_DIR .. "src/devices/bus/rc2014/serial.cpp", MAME_DIR .. "src/devices/bus/rc2014/serial.h", - MAME_DIR .. "src/devices/bus/rc2014/cf.cpp", - MAME_DIR .. "src/devices/bus/rc2014/cf.h", + MAME_DIR .. "src/devices/bus/rc2014/sound.cpp", + MAME_DIR .. "src/devices/bus/rc2014/sound.h", + MAME_DIR .. "src/devices/bus/rc2014/z80cpu.cpp", + MAME_DIR .. "src/devices/bus/rc2014/z80cpu.h", } end diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 85b566f0e97..16ab338b889 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -1044,6 +1044,8 @@ files { MAME_DIR .. "src/mame/audio/decobsmt.h", MAME_DIR .. "src/mame/audio/efo_zsu.cpp", MAME_DIR .. "src/mame/audio/efo_zsu.h", + MAME_DIR .. "src/mame/audio/fruitsamples.cpp", + MAME_DIR .. "src/mame/audio/fruitsamples.h", MAME_DIR .. "src/mame/audio/rax.cpp", MAME_DIR .. "src/mame/audio/rax.h", MAME_DIR .. "src/mame/audio/segam1audio.cpp", @@ -2331,6 +2333,8 @@ files { MAME_DIR .. "src/mame/drivers/jpmsys5sw.cpp", MAME_DIR .. "src/mame/drivers/jpmmps.cpp", MAME_DIR .. "src/mame/drivers/jpms80.cpp", + MAME_DIR .. "src/mame/audio/nl_jpmsru.cpp", + MAME_DIR .. "src/mame/audio/nl_jpmsru.h", MAME_DIR .. "src/mame/drivers/jpmsru.cpp", MAME_DIR .. "src/mame/drivers/jpmimpct.cpp", MAME_DIR .. "src/mame/includes/jpmimpct.h", @@ -4483,8 +4487,6 @@ files { MAME_DIR .. "src/mame/includes/fromanc2.h", MAME_DIR .. "src/mame/video/fromanc2.cpp", MAME_DIR .. "src/mame/drivers/gstriker.cpp", - MAME_DIR .. "src/mame/includes/gstriker.h", - MAME_DIR .. "src/mame/video/gstriker.cpp", MAME_DIR .. "src/mame/video/mb60553.cpp", MAME_DIR .. "src/mame/video/mb60553.h", MAME_DIR .. "src/mame/video/vs920a.cpp", |