Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-05-07 06:44:51 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/mamedev/master' into vaportra

Browse Source
This commit is contained in:
darq 2016-12-08 15:44:44 +01:00
commit f7e2b25ea3
7 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -21,6 +21,7 @@
!/language/ !/language/
!/nl_examples/ !/nl_examples/
!/plugins/ !/plugins/
!/projects/
!/regtests/ !/regtests/
!/samples/ !/samples/
!/scripts/ !/scripts/

8
makefile
View File

@ -217,6 +217,10 @@ endif
# build scripts will be run from # build scripts will be run from
# scripts/target/$(TARGET)/$(SUBTARGET).lua # scripts/target/$(TARGET)/$(SUBTARGET).lua
#------------------------------------------------- #-------------------------------------------------
ifdef PROJECT
PARAMS += --PROJECT='$(PROJECT)'
TARGET := $(PROJECT)
endif
ifndef TARGET ifndef TARGET
TARGET := mame TARGET := mame
@ -800,8 +804,12 @@ SCRIPTS += scripts/target/$(TARGET)/mess.lua
endif endif
ifndef SOURCES ifndef SOURCES
ifdef PROJECT
SCRIPTS += projects/$(PROJECT)/scripts/target/$(TARGET)/$(SUBTARGET_FULL).lua
else
SCRIPTS += scripts/target/$(TARGET)/$(SUBTARGET_FULL).lua SCRIPTS += scripts/target/$(TARGET)/$(SUBTARGET_FULL).lua
endif endif
endif
ifdef REGENIE ifdef REGENIE
SCRIPTS+= regenie SCRIPTS+= regenie

3
projects/.gitignore vendored Normal file
View File

@ -0,0 +1,3 @@
*
!/.gitignore
!/README.md

4
projects/README.md Normal file
View File

@ -0,0 +1,4 @@
# **Projects** #
This is place where source code projects outside of MAME lives.
Here you can git clone that kind of project and make it with "make PROJECT=example"

14
scripts/genie.lua
View File

@ -386,6 +386,11 @@ newoption {
description = "Produce WebAssembly output when building with Emscripten.", description = "Produce WebAssembly output when building with Emscripten.",
} }
newoption {
trigger = "PROJECT",
description = "Select projects to be built. Will look into project folder for files.",
}
dofile ("extlib.lua") dofile ("extlib.lua")
if _OPTIONS["SHLIB"]=="1" then if _OPTIONS["SHLIB"]=="1" then
@ -516,7 +521,14 @@ msgprecompile ("Precompiling $(subst ../,,$<)...")
messageskip { "SkipCreatingMessage", "SkipBuildingMessage", "SkipCleaningMessage" } messageskip { "SkipCreatingMessage", "SkipBuildingMessage", "SkipCleaningMessage" }
if (_OPTIONS["SOURCES"] == nil) then if (_OPTIONS["PROJECT"] ~= nil) then
PROJECT_DIR = path.join(path.getabsolute(".."),"projects",_OPTIONS["PROJECT"]) .. "/"
if (not os.isfile(path.join("..", "projects", _OPTIONS["PROJECT"], "scripts", "target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))) then
error("File definition for TARGET=" .. _OPTIONS["target"] .. " SUBTARGET=" .. _OPTIONS["subtarget"] .. " does not exist")
end
dofile (path.join(".." ,"projects", _OPTIONS["PROJECT"], "scripts", "target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))
end
if (_OPTIONS["SOURCES"] == nil and _OPTIONS["PROJECT"] == nil) then
if (not os.isfile(path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))) then if (not os.isfile(path.join("target", _OPTIONS["target"],_OPTIONS["subtarget"] .. ".lua"))) then
error("File definition for TARGET=" .. _OPTIONS["target"] .. " SUBTARGET=" .. _OPTIONS["subtarget"] .. " does not exist") error("File definition for TARGET=" .. _OPTIONS["target"] .. " SUBTARGET=" .. _OPTIONS["subtarget"] .. " does not exist")
end end

4
scripts/src/main.lua
View File

@ -276,8 +276,12 @@ end
links { links {
ext_lib("zlib"), ext_lib("zlib"),
ext_lib("flac"), ext_lib("flac"),
}
if (STANDALONE~=true) then
links {
ext_lib("sqlite3"), ext_lib("sqlite3"),
} }
end
if _OPTIONS["NO_USE_MIDI"]~="1" then if _OPTIONS["NO_USE_MIDI"]~="1" then
links { links {

6
src/mame/drivers/dec8.cpp
View File

@ -3210,7 +3210,8 @@ ROM_START( csilver )
ROM_CONTINUE( 0x08000, 0x08000 ) ROM_CONTINUE( 0x08000, 0x08000 )
ROM_REGION( 0x1000, "mcu", 0 ) /* ID8751H MCU */ ROM_REGION( 0x1000, "mcu", 0 ) /* ID8751H MCU */
ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, NO_DUMP ) // dx-8.19a ? // 017F: B4 4C 0D : cjne a,#$4C,$018F (ID code 0x4c = World version)
ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, CRC(ca663965) SHA1(a5fb7afdfd324761bde4bb90ba12efc9954627af) ) // dx-8.19a ?
ROM_REGION( 0x08000, "gfx1", 0 ) /* characters */ ROM_REGION( 0x08000, "gfx1", 0 ) /* characters */
ROM_LOAD( "dx00.3d", 0x00000, 0x08000, CRC(f01ef985) SHA1(d5b823bd7c0efcf3137f8643c5d99a260bed5675) ) ROM_LOAD( "dx00.3d", 0x00000, 0x08000, CRC(f01ef985) SHA1(d5b823bd7c0efcf3137f8643c5d99a260bed5675) )
@ -3410,7 +3411,8 @@ ROM_START( srdarwin )
ROM_LOAD( "dy04.d7", 0x8000, 0x8000, CRC(2ae3591c) SHA1(f21b06d84e2c3d3895be0812024641fd006e45cf) ) ROM_LOAD( "dy04.d7", 0x8000, 0x8000, CRC(2ae3591c) SHA1(f21b06d84e2c3d3895be0812024641fd006e45cf) )
ROM_REGION( 0x1000, "mcu", 0 ) /* ID8751H MCU */ ROM_REGION( 0x1000, "mcu", 0 ) /* ID8751H MCU */
ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, NO_DUMP ) // 0160: B4 6B 0D : cjne a,#$6B,$0170 (ID code 0x6b = World version)
ROM_LOAD( "id8751h.mcu", 0x0000, 0x1000, CRC(11cd6ca4) SHA1(ec70f84228e37f9fc1bda85fa52a009f61c500b2) )
ROM_REGION( 0x08000, "gfx1", 0 ) /* characters */ ROM_REGION( 0x08000, "gfx1", 0 ) /* characters */
ROM_LOAD( "dy05.b6", 0x00000, 0x4000, CRC(8780e8a3) SHA1(03ea91fdc5aba8e139201604fb3bf9b69f71f056) ) ROM_LOAD( "dy05.b6", 0x00000, 0x4000, CRC(8780e8a3) SHA1(03ea91fdc5aba8e139201604fb3bf9b69f71f056) )