summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2015-03-30 18:29:59 +1100
committer Vas Crabb <vas@vastheman.com>2015-03-30 18:30:29 +1100
commit73deef44fa82cbccdc3963a5ff5f694e1549bdeb (patch)
treedbadd1eb4989f763f5641751818b51942311a114
parent7ae85d216b6e94925c5606331854d287a0532a7c (diff)
Fix UME build, allow custom target to inject stuff in main makefile
-rw-r--r--makefile11
-rw-r--r--src/ume/ume.mak13
2 files changed, 20 insertions, 4 deletions
diff --git a/makefile b/makefile
index d83c746d365..472eed81edf 100644
--- a/makefile
+++ b/makefile
@@ -351,10 +351,9 @@ SCRIPTS = scripts/genie.lua \
scripts/src/bus.lua \
scripts/src/netlist.lua \
scripts/toolchain.lua \
- scripts/target/$(TARGET)/$(SUBTARGET).lua
-ifneq (,$(wildcard src/osd/$(OSD)/$(OSD).mak))
-SCRIPTS+= src/osd/$(OSD)/$(OSD).mak
-endif
+ scripts/target/$(TARGET)/$(SUBTARGET).lua \
+ $(wildcard src/osd/$(OSD)/$(OSD).mak) \
+ $(wildcard src/$(TARGET)/$(SUBTARGET).mak)
ifdef REGENIE
SCRIPTS+= regenie
endif
@@ -721,6 +720,10 @@ ifneq (,$(wildcard src/osd/$(OSD)/$(OSD).mak))
include src/osd/$(OSD)/$(OSD).mak
endif
+ifneq (,$(wildcard src/$(TARGET)/$(SUBTARGET).mak))
+include src/$(TARGET)/$(SUBTARGET).mak
+endif
+
$(GEN_FOLDERS):
-$(call MKDIR,$@)
diff --git a/src/ume/ume.mak b/src/ume/ume.mak
new file mode 100644
index 00000000000..d319b666311
--- /dev/null
+++ b/src/ume/ume.mak
@@ -0,0 +1,13 @@
+###########################################################################
+#
+# makefile
+#
+# Additional makefile for building UME
+#
+# Copyright (c) Nicola Salmoria and the MAME Team.
+# Visit http://mamedev.org for licensing and usage restrictions.
+#
+###########################################################################
+
+GEN_FOLDERS += $(GENDIR)/mame/layout/ $(GENDIR)/mess/layout/
+LAYOUTS += $(wildcard $(SRC)/mame/layout/*.lay) $(wildcard $(SRC)/mess/layout/*.lay)