diff options
| author | 2017-02-16 12:20:35 +1100 | |
|---|---|---|
| committer | 2017-02-16 12:20:35 +1100 | |
| commit | fb087b6c9231b272cb48d6004c7984eebaf5d24f (patch) | |
| tree | 14c2df6b2e3f696d11d72b32ae475cc4278071db /scripts | |
| parent | 6ed0bad7f8a2bea7299ab1a8c8908f55b3accebd (diff) | |
Cherry-pick some features from self-registering drivers PoC:
* Use size_t for sizes and <algorithm> for algorithms
* Fix up some files that were getting linked into multiple libs
* Add missing virtual method to sh2 peripheral class
* Put shortname in driver struct for locality
* Use shared pointers in config LRU cache for safety
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/build/makelist.py | 2 | ||||
| -rw-r--r-- | scripts/src/cpu.lua | 7 | ||||
| -rw-r--r-- | scripts/src/sound.lua | 3 | ||||
| -rw-r--r-- | scripts/target/mame/arcade.lua | 12 |
4 files changed, 6 insertions, 18 deletions
diff --git a/scripts/build/makelist.py b/scripts/build/makelist.py index a9b450474e2..1a27a515e04 100644 --- a/scripts/build/makelist.py +++ b/scripts/build/makelist.py @@ -164,4 +164,4 @@ print("};") print("") # also output a global count -print("int driver_list::s_driver_count = %d;\n" % len(drivlist)) +print("std::size_t const driver_list::s_driver_count = %d;\n" % len(drivlist)) diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua index 12f877f4f10..8b2fc31abed 100644 --- a/scripts/src/cpu.lua +++ b/scripts/src/cpu.lua @@ -27,7 +27,6 @@ if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RS MAME_DIR .. "src/devices/cpu/drcuml.h", MAME_DIR .. "src/devices/cpu/uml.cpp", MAME_DIR .. "src/devices/cpu/uml.h", - MAME_DIR .. "src/devices/cpu/i386/i386dasm.cpp", MAME_DIR .. "src/devices/cpu/x86log.cpp", MAME_DIR .. "src/devices/cpu/x86log.h", MAME_DIR .. "src/devices/cpu/drcbex86.cpp", @@ -931,7 +930,7 @@ if (CPUS["I86"]~=null) then } end -if (CPUS["I86"]~=null or _OPTIONS["with-tools"]) then +if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RSP"]~=null or CPUS["ARM7"]~=null or CPUS["ADSP21062"]~=null or CPUS["MB86235"]~=null or CPUS["I86"]~=null or _OPTIONS["with-tools"]) then table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.cpp") end @@ -951,10 +950,6 @@ if (CPUS["I386"]~=null) then } end -if (CPUS["I386"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/i386/i386dasm.cpp") -end - -------------------------------------------------- -- Intel i860 --@src/devices/cpu/i860/i860.h,CPUS["I860"] = true diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua index 171ad3f30cc..fd1dc2f33a3 100644 --- a/scripts/src/sound.lua +++ b/scripts/src/sound.lua @@ -755,9 +755,6 @@ if (SOUNDS["QSOUND"]~=null) then files { MAME_DIR .. "src/devices/sound/qsound.cpp", MAME_DIR .. "src/devices/sound/qsound.h", - MAME_DIR .. "src/devices/cpu/dsp16/dsp16.cpp", - MAME_DIR .. "src/devices/cpu/dsp16/dsp16.h", - MAME_DIR .. "src/devices/cpu/dsp16/dsp16dis.cpp", } end diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 7d75617c22c..c06831fb7dc 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -848,6 +848,8 @@ function createProjects_mame_arcade(_target, _subtarget) createMAMEProjects(_target, _subtarget, "shared") files { + MAME_DIR .. "src/mame/machine/meters.cpp", + MAME_DIR .. "src/mame/machine/meters.h", MAME_DIR .. "src/mame/machine/nmk112.cpp", MAME_DIR .. "src/mame/machine/nmk112.h", MAME_DIR .. "src/mame/machine/pcshare.cpp", @@ -858,6 +860,8 @@ files { MAME_DIR .. "src/mame/machine/ticket.h", MAME_DIR .. "src/mame/video/avgdvg.cpp", MAME_DIR .. "src/mame/video/avgdvg.h", + MAME_DIR .. "src/mame/video/awpvid.cpp", + MAME_DIR .. "src/mame/video/awpvid.h", MAME_DIR .. "src/mame/audio/dcs.cpp", MAME_DIR .. "src/mame/audio/dcs.h", MAME_DIR .. "src/mame/audio/decobsmt.cpp", @@ -1266,10 +1270,6 @@ files { MAME_DIR .. "src/mame/drivers/mpu4misc.hxx", MAME_DIR .. "src/mame/drivers/mpu5.cpp", MAME_DIR .. "src/mame/drivers/mpu5.hxx", - MAME_DIR .. "src/mame/video/awpvid.cpp", - MAME_DIR .. "src/mame/video/awpvid.h", - MAME_DIR .. "src/mame/machine/meters.cpp", - MAME_DIR .. "src/mame/machine/meters.h", } createMAMEProjects(_target, _subtarget, "bfm") @@ -2088,10 +2088,6 @@ files { MAME_DIR .. "src/mame/drivers/jpmimpctsw.cpp", MAME_DIR .. "src/mame/drivers/pluto5.cpp", MAME_DIR .. "src/mame/drivers/jpmsys7.cpp", - MAME_DIR .. "src/mame/video/awpvid.cpp", - MAME_DIR .. "src/mame/video/awpvid.h", - MAME_DIR .. "src/mame/machine/meters.cpp", - MAME_DIR .. "src/mame/machine/meters.h", } createMAMEProjects(_target, _subtarget, "kaneko") |
