Merge release0221 into master (nw)

This commit is contained in:
Vas Crabb 2020-04-29 02:17:12 +10:00 committed by GitHub
commit 01a4fbef4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 26 deletions

View File

@ -459,7 +459,7 @@ links {
includedirs { includedirs {
MAME_DIR .. "src/lib", MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/netlist", MAME_DIR .. "src/lib/netlist",
} }
defines { defines {
@ -471,13 +471,13 @@ files {
} }
configuration { "mingw*" } configuration { "mingw*" }
linkoptions{ linkoptions{
"-municode", "-municode",
} }
configuration { "vs*" } configuration { "vs*" }
flags { flags {
"Unicode", "Unicode",
} }
configuration { "mingw*" or "vs*" } configuration { "mingw*" or "vs*" }
targetextension ".exe" targetextension ".exe"
@ -508,7 +508,7 @@ links {
includedirs { includedirs {
MAME_DIR .. "src/lib", MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/netlist", MAME_DIR .. "src/lib/netlist",
} }
files { files {
@ -516,13 +516,13 @@ files {
} }
configuration { "mingw*" } configuration { "mingw*" }
linkoptions{ linkoptions{
"-municode", "-municode",
} }
configuration { "vs*" } configuration { "vs*" }
flags { flags {
"Unicode", "Unicode",
} }
configuration { "mingw*" or "vs*" } configuration { "mingw*" or "vs*" }
targetextension ".exe" targetextension ".exe"

View File

@ -162,8 +162,8 @@ ROM_END
Drivers Drivers
******************************************************************************/ ******************************************************************************/
// YEAR NAME PARENT CMP MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS // YEAR NAME PARENT CMP MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS
CONS( 1986, leonardo, 0, 0, leo, leo, leo_state, empty_init, "SciSys", "Kasparov Leonardo (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) CONS( 1986, leonardo, 0, 0, leo, leo, leo_state, empty_init, "SciSys", "Kasparov Leonardo (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
CONS( 1986, leonardoa, 0, 0, leo, leo, leo_state, empty_init, "SciSys", "Kasparov Leonardo (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) CONS( 1986, leonardoa, leonardo, 0, leo, leo, leo_state, empty_init, "SciSys", "Kasparov Leonardo (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
CONS( 1988, galileo, 0, 0, leo, leo, leo_state, empty_init, "Saitek", "Kasparov Galileo", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) CONS( 1988, galileo, 0, 0, leo, leo, leo_state, empty_init, "Saitek", "Kasparov Galileo", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )

View File

@ -145,6 +145,6 @@ ROM_END
Drivers Drivers
******************************************************************************/ ******************************************************************************/
// YEAR NAME PARENT CMP MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS // YEAR NAME PARENT CMP MACHINE INPUT CLASS INIT COMPANY, FULLNAME, FLAGS
CONS( 1989, renaissa, 0, 0, ren, ren, ren_state, empty_init, "Saitek", "Kasparov Renaissance (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) CONS( 1989, renaissa, 0, 0, ren, ren, ren_state, empty_init, "Saitek", "Kasparov Renaissance (set 1)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )
CONS( 1989, renaissaa, 0, 0, ren, ren, ren_state, empty_init, "Saitek", "Kasparov Renaissance (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING ) CONS( 1989, renaissaa, renaissa, 0, ren, ren, ren_state, empty_init, "Saitek", "Kasparov Renaissance (set 2)", MACHINE_SUPPORTS_SAVE | MACHINE_NOT_WORKING )

View File

@ -557,8 +557,3 @@ zzblock // (c) 1979 Taito
@source:usbilliards.cpp @source:usbilliards.cpp
sharkusb // (c) 1975 US Billiards sharkusb // (c) 1975 US Billiards