Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-03 17:08:39 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
David Haywood 2015-11-11 21:09:26 +00:00
commit 603be40647
8 changed files with 1349 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

906
scripts/target/mame/arcade.lua
View File

File diff suppressed because it is too large Load Diff

10
scripts/target/mame/dummy.lua
View File

@ -29,10 +29,12 @@ function createProjects_mame_dummy(_target, _subtarget)
GEN_DIR .. "mess/layout",
}
files{
MAME_DIR .. "src/mame/drivers/coleco.cpp",
MAME_DIR .. "src/mame/machine/coleco.cpp",
}
files{
MAME_DIR .. "src/mame/drivers/coleco.cpp",
MAME_DIR .. "src/mame/includes/coleco.h",
MAME_DIR .. "src/mame/machine/coleco.cpp",
MAME_DIR .. "src/mame/machine/coleco.h",
}
end
function linkProjects_mame_dummy(_target, _subtarget)

2
scripts/target/mame/mame.lua
View File

@ -20,4 +20,4 @@ end
function linkProjects_mame_mame(_target, _subtarget)
linkProjects_mame_arcade(_target, _subtarget)
linkProjects_mame_mess(_target, _subtarget)
end
end

367
scripts/target/mame/mess.lua
View File

File diff suppressed because it is too large Load Diff

22
scripts/target/mame/nl.lua
View File

@ -97,18 +97,20 @@ function createProjects_mame_nl(_target, _subtarget)
GEN_DIR .. "mame/layout",
}
files{
MAME_DIR .. "src/mame/drivers/pong.cpp",
MAME_DIR .. "src/mame/drivers/nl_pong.cpp",
MAME_DIR .. "src/mame/drivers/nl_pongd.cpp",
MAME_DIR .. "src/mame/drivers/nl_breakout.cpp",
files{
MAME_DIR .. "src/mame/drivers/pong.cpp",
MAME_DIR .. "src/mame/drivers/nl_pong.cpp",
MAME_DIR .. "src/mame/drivers/nl_pongd.cpp",
MAME_DIR .. "src/mame/drivers/nl_breakout.cpp",
MAME_DIR .. "src/mame/drivers/1942.cpp",
MAME_DIR .. "src/mame/video/1942.cpp",
MAME_DIR .. "src/mame/drivers/popeye.cpp",
MAME_DIR .. "src/mame/video/popeye.cpp",
MAME_DIR .. "src/mame/drivers/1942.cpp",
MAME_DIR .. "src/mame/includes/1942.h",
MAME_DIR .. "src/mame/video/1942.cpp",
MAME_DIR .. "src/mame/drivers/popeye.cpp",
MAME_DIR .. "src/mame/includes/popeye.h",
MAME_DIR .. "src/mame/video/popeye.cpp",
}
}
end
function linkProjects_mame_nl(_target, _subtarget)

95
scripts/target/mame/tiny.lua
View File

@ -92,46 +92,61 @@ function createProjects_mame_tiny(_target, _subtarget)
GEN_DIR .. "mame/layout",
}
files{
MAME_DIR .. "src/mame/machine/ticket.cpp",
MAME_DIR .. "src/mame/drivers/carpolo.cpp",
MAME_DIR .. "src/mame/machine/carpolo.cpp",
MAME_DIR .. "src/mame/video/carpolo.cpp",
MAME_DIR .. "src/mame/drivers/circus.cpp",
MAME_DIR .. "src/mame/audio/circus.cpp",
MAME_DIR .. "src/mame/video/circus.cpp",
MAME_DIR .. "src/mame/drivers/exidy.cpp",
MAME_DIR .. "src/mame/audio/exidy.cpp",
MAME_DIR .. "src/mame/video/exidy.cpp",
MAME_DIR .. "src/mame/audio/exidy440.cpp",
MAME_DIR .. "src/mame/drivers/starfire.cpp",
MAME_DIR .. "src/mame/video/starfire.cpp",
MAME_DIR .. "src/mame/drivers/vertigo.cpp",
MAME_DIR .. "src/mame/machine/vertigo.cpp",
MAME_DIR .. "src/mame/video/vertigo.cpp",
MAME_DIR .. "src/mame/drivers/victory.cpp",
MAME_DIR .. "src/mame/video/victory.cpp",
MAME_DIR .. "src/mame/audio/targ.cpp",
MAME_DIR .. "src/mame/drivers/astrocde.cpp",
MAME_DIR .. "src/mame/video/astrocde.cpp",
MAME_DIR .. "src/mame/drivers/gridlee.cpp",
MAME_DIR .. "src/mame/audio/gridlee.cpp",
MAME_DIR .. "src/mame/video/gridlee.cpp",
MAME_DIR .. "src/mame/drivers/williams.cpp",
MAME_DIR .. "src/mame/machine/williams.cpp",
MAME_DIR .. "src/mame/audio/williams.cpp",
MAME_DIR .. "src/mame/video/williams.cpp",
MAME_DIR .. "src/mame/audio/gorf.cpp",
MAME_DIR .. "src/mame/audio/wow.cpp",
MAME_DIR .. "src/mame/drivers/gaelco.cpp",
MAME_DIR .. "src/mame/video/gaelco.cpp",
MAME_DIR .. "src/mame/machine/gaelcrpt.cpp",
MAME_DIR .. "src/mame/drivers/wrally.cpp",
MAME_DIR .. "src/mame/machine/wrally.cpp",
MAME_DIR .. "src/mame/video/wrally.cpp",
MAME_DIR .. "src/mame/drivers/looping.cpp",
MAME_DIR .. "src/mame/drivers/supertnk.cpp",
}
files{
MAME_DIR .. "src/mame/machine/ticket.cpp",
MAME_DIR .. "src/mame/machine/ticket.h",
MAME_DIR .. "src/mame/drivers/carpolo.cpp",
MAME_DIR .. "src/mame/includes/carpolo.h",
MAME_DIR .. "src/mame/machine/carpolo.cpp",
MAME_DIR .. "src/mame/video/carpolo.cpp",
MAME_DIR .. "src/mame/drivers/circus.cpp",
MAME_DIR .. "src/mame/includes/circus.h",
MAME_DIR .. "src/mame/audio/circus.cpp",
MAME_DIR .. "src/mame/video/circus.cpp",
MAME_DIR .. "src/mame/drivers/exidy.cpp",
MAME_DIR .. "src/mame/includes/exidy.h",
MAME_DIR .. "src/mame/audio/exidy.cpp",
MAME_DIR .. "src/mame/audio/exidy.h",
MAME_DIR .. "src/mame/video/exidy.cpp",
MAME_DIR .. "src/mame/audio/exidy440.cpp",
MAME_DIR .. "src/mame/audio/exidy440.h",
MAME_DIR .. "src/mame/drivers/starfire.cpp",
MAME_DIR .. "src/mame/includes/starfire.h",
MAME_DIR .. "src/mame/video/starfire.cpp",
MAME_DIR .. "src/mame/drivers/vertigo.cpp",
MAME_DIR .. "src/mame/includes/vertigo.h",
MAME_DIR .. "src/mame/machine/vertigo.cpp",
MAME_DIR .. "src/mame/video/vertigo.cpp",
MAME_DIR .. "src/mame/drivers/victory.cpp",
MAME_DIR .. "src/mame/includes/victory.h",
MAME_DIR .. "src/mame/video/victory.cpp",
MAME_DIR .. "src/mame/audio/targ.cpp",
MAME_DIR .. "src/mame/drivers/astrocde.cpp",
MAME_DIR .. "src/mame/includes/astrocde.h",
MAME_DIR .. "src/mame/video/astrocde.cpp",
MAME_DIR .. "src/mame/drivers/gridlee.cpp",
MAME_DIR .. "src/mame/includes/gridlee.h",
MAME_DIR .. "src/mame/audio/gridlee.cpp",
MAME_DIR .. "src/mame/video/gridlee.cpp",
MAME_DIR .. "src/mame/drivers/williams.cpp",
MAME_DIR .. "src/mame/includes/williams.h",
MAME_DIR .. "src/mame/machine/williams.cpp",
MAME_DIR .. "src/mame/audio/williams.cpp",
MAME_DIR .. "src/mame/audio/williams.h",
MAME_DIR .. "src/mame/video/williams.cpp",
MAME_DIR .. "src/mame/audio/gorf.cpp",
MAME_DIR .. "src/mame/audio/wow.cpp",
MAME_DIR .. "src/mame/drivers/gaelco.cpp",
MAME_DIR .. "src/mame/includes/gaelco.h",
MAME_DIR .. "src/mame/video/gaelco.cpp",
MAME_DIR .. "src/mame/machine/gaelcrpt.cpp",
MAME_DIR .. "src/mame/drivers/wrally.cpp",
MAME_DIR .. "src/mame/includes/wrally.h",
MAME_DIR .. "src/mame/machine/wrally.cpp",
MAME_DIR .. "src/mame/video/wrally.cpp",
MAME_DIR .. "src/mame/drivers/looping.cpp",
MAME_DIR .. "src/mame/drivers/supertnk.cpp",
}
end
function linkProjects_mame_tiny(_target, _subtarget)

2
src/mame/drivers/a7800.cpp
View File

@ -284,7 +284,7 @@ static ADDRESS_MAP_START( a7800_mem, AS_PROGRAM, 8, a7800_state )
AM_RANGE(0x0020, 0x003f) AM_MIRROR(0x300) AM_DEVREADWRITE("maria", atari_maria_device, read, write)
AM_RANGE(0x0040, 0x00ff) AM_RAMBANK("zpmirror") // mirror of 0x2040-0x20ff, for zero page
AM_RANGE(0x0140, 0x01ff) AM_RAMBANK("spmirror") // mirror of 0x2140-0x21ff, for stack page
AM_RANGE(0x0280, 0x029f) AM_MIRROR(0x60) AM_DEVICE("riot", mos6532_t, io_map)
AM_RANGE(0x0280, 0x02ff) AM_DEVICE("riot", mos6532_t, io_map)
AM_RANGE(0x0480, 0x04ff) AM_MIRROR(0x100) AM_DEVICE("riot", mos6532_t, ram_map)
AM_RANGE(0x1800, 0x1fff) AM_RAM AM_SHARE("6116_1")
AM_RANGE(0x2000, 0x27ff) AM_RAM AM_SHARE("6116_2")

2
src/osd/strconv.cpp
View File

@ -119,7 +119,7 @@ int osd_uchar_from_osdchar(UINT32 *uchar, const char *osdchar, size_t count)
}
#else
#include "unicode.h"
//============================================================
// osd_uchar_from_osdchar
//============================================================