Skip to content

Commit

Permalink
Enable building projects that are separate of MAME but use same core …
Browse files Browse the repository at this point in the history
…and lives in separate git tree (nw)
  • Loading branch information
mmicko committed Dec 8, 2016
1 parent 3408ed0 commit 124f30d
Show file tree
Hide file tree
Showing 6 changed files with 33 additions and 1 deletion.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
!/language/
!/nl_examples/
!/plugins/
!/projects/
!/regtests/
!/samples/
!/scripts/
Expand Down
8 changes: 8 additions & 0 deletions makefile
Original file line number Diff line number Diff line change
Expand Up @@ -217,6 +217,10 @@ endif
# build scripts will be run from
# scripts/target/$(TARGET)/$(SUBTARGET).lua
#-------------------------------------------------
ifdef PROJECT
PARAMS += --PROJECT='$(PROJECT)'
TARGET := $(PROJECT)
endif

ifndef TARGET
TARGET := mame
Expand Down Expand Up @@ -800,8 +804,12 @@ SCRIPTS += scripts/target/$(TARGET)/mess.lua
endif

ifndef SOURCES
ifdef PROJECT
SCRIPTS += projects/$(PROJECT)/scripts/target/$(TARGET)/$(SUBTARGET_FULL).lua
else
SCRIPTS += scripts/target/$(TARGET)/$(SUBTARGET_FULL).lua
endif
endif

ifdef REGENIE
SCRIPTS+= regenie
Expand Down
3 changes: 3 additions & 0 deletions projects/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
*
!/.gitignore
!/README.md
4 changes: 4 additions & 0 deletions projects/README.md
Original file line number Diff line number Diff line change
@@ -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 changes: 13 additions & 1 deletion scripts/genie.lua
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,11 @@ newoption {
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")

if _OPTIONS["SHLIB"]=="1" then
Expand Down Expand Up @@ -516,7 +521,14 @@ msgprecompile ("Precompiling $(subst ../,,$<)...")

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
error("File definition for TARGET=" .. _OPTIONS["target"] .. " SUBTARGET=" .. _OPTIONS["subtarget"] .. " does not exist")
end
Expand Down
4 changes: 4 additions & 0 deletions scripts/src/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -276,8 +276,12 @@ end
links {
ext_lib("zlib"),
ext_lib("flac"),
}
if (STANDALONE~=true) then
links {
ext_lib("sqlite3"),
}
end

if _OPTIONS["NO_USE_MIDI"]~="1" then
links {
Expand Down

0 comments on commit 124f30d

Please sign in to comment.