summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--makefile128
-rw-r--r--scripts/genie.lua9
-rw-r--r--scripts/src/bus.lua11
-rw-r--r--scripts/src/cpu.lua78
-rw-r--r--scripts/src/emu.lua54
-rw-r--r--scripts/src/main.lua20
-rw-r--r--scripts/src/osd/windows.lua6
-rw-r--r--scripts/target/ldplayer/ldplayer.lua8
-rw-r--r--scripts/target/mame/tiny.lua22
-rw-r--r--scripts/target/mess/mess.lua6
-rw-r--r--src/ume/tiny.lst4
-rw-r--r--src/ume/ume.lst4
12 files changed, 217 insertions, 133 deletions
diff --git a/makefile b/makefile
index afd51ed75b3..ef21df32cb8 100644
--- a/makefile
+++ b/makefile
@@ -790,19 +790,11 @@ clean:
GEN_FOLDERS := \
$(GENDIR) \
$(GENDIR)/$(TARGET)/$(SUBTARGET) \
- $(GENDIR)/emu/layout/ \
$(GENDIR)/$(TARGET)/layout/ \
- $(GENDIR)/mess/drivers/ \
- $(GENDIR)/emu/cpu/arcompact/ \
- $(GENDIR)/emu/cpu/h8/ \
- $(GENDIR)/emu/cpu/mcs96/ \
- $(GENDIR)/emu/cpu/m6502/ \
- $(GENDIR)/emu/cpu/m6809/ \
- $(GENDIR)/emu/cpu/tms57002/ \
$(GENDIR)/osd/modules/debugger/qt/ \
$(GENDIR)/resource/
-LAYOUTS=$(wildcard $(SRC)/emu/layout/*.lay) $(wildcard $(SRC)/$(TARGET)/layout/*.lay)
+LAYOUTS=$(wildcard $(SRC)/$(TARGET)/layout/*.lay)
MOC_FILES=$(wildcard $(SRC)/osd/modules/debugger/qt/*.h)
ifneq ($(USE_QTDEBUG),1)
@@ -858,132 +850,16 @@ generate: \
$(GEN_FOLDERS) \
$(patsubst $(SRC)/%.lay,$(GENDIR)/%.lh,$(LAYOUTS)) \
$(patsubst $(SRC)/%.h,$(GENDIR)/%.moc.c,$(MOC_FILES)) \
- $(GENDIR)/emu/uismall.fh \
- $(GENDIR)/resource/$(TARGET)vers.rc \
- $(GENDIR)/resource/$(TARGET)-Info.plist \
- $(GENDIR)/$(TARGET)/$(SUBTARGET)/drivlist.c \
- $(GENDIR)/mess/drivers/ymmu100.inc \
- $(GENDIR)/emu/cpu/arcompact/arcompact.inc \
- $(GENDIR)/emu/cpu/h8/h8.inc $(GENDIR)/emu/cpu/h8/h8h.inc $(GENDIR)/emu/cpu/h8/h8s2000.inc $(GENDIR)/emu/cpu/h8/h8s2600.inc \
- $(GENDIR)/emu/cpu/mcs96/mcs96.inc $(GENDIR)/emu/cpu/mcs96/i8x9x.inc $(GENDIR)/emu/cpu/mcs96/i8xc196.inc \
- $(GENDIR)/emu/cpu/m6502/deco16.inc $(GENDIR)/emu/cpu/m6502/m4510.inc $(GENDIR)/emu/cpu/m6502/m6502.inc $(GENDIR)/emu/cpu/m6502/m65c02.inc $(GENDIR)/emu/cpu/m6502/m65ce02.inc $(GENDIR)/emu/cpu/m6502/m6509.inc $(GENDIR)/emu/cpu/m6502/m6510.inc $(GENDIR)/emu/cpu/m6502/n2a03.inc $(GENDIR)/emu/cpu/m6502/r65c02.inc $(GENDIR)/emu/cpu/m6502/m740.inc \
- $(GENDIR)/emu/cpu/m6809/m6809.inc $(GENDIR)/emu/cpu/m6809/hd6309.inc $(GENDIR)/emu/cpu/m6809/konami.inc \
- $(GENDIR)/emu/cpu/tms57002/tms57002.inc
+ $(GENDIR)/resource/$(TARGET)-Info.plist
$(GENDIR)/%.lh: $(SRC)/%.lay $(SRC)/build/file2str.py
@echo Converting $<...
$(PYTHON) $(SRC)/build/file2str.py $< $@ layout_$(basename $(notdir $<))
-$(GENDIR)/%.fh: $(SRC)/%.png $(SRC)/build/png2bdc.py $(SRC)/build/file2str.py
- @echo Converting $<...
- $(PYTHON) $(SRC)/build/png2bdc.py $< $(GENDIR)/temp.bdc
- $(PYTHON) $(SRC)/build/file2str.py $(GENDIR)/temp.bdc $@ font_$(basename $(notdir $<)) UINT8
-
-$(GENDIR)/resource/$(TARGET)vers.rc: $(SRC)/build/verinfo.py $(SRC)/version.c
- @echo Emitting $@...
- $(PYTHON) $(SRC)/build/verinfo.py -r -b $(TARGET) $(SRC)/version.c > $@
-
$(GENDIR)/resource/$(TARGET)-Info.plist: $(SRC)/build/verinfo.py $(SRC)/version.c
@echo Emitting $@...
$(PYTHON) $(SRC)/build/verinfo.py -p -b $(TARGET) $(SRC)/version.c > $@
-$(GENDIR)/$(TARGET)/$(SUBTARGET)/drivlist.c: $(SRC)/$(TARGET)/$(SUBTARGET).lst $(SRC)/build/makelist.py
- @echo Building driver list $<...
- $(PYTHON) $(SRC)/build/makelist.py $< >$@
-
-# rule to generate the C files
-$(GENDIR)/emu/cpu/arcompact/arcompact.inc: $(SRC)/emu/cpu/arcompact/arcompact_make.py
- @echo Generating arcompact source .inc files...
- $(PYTHON) $(SRC)/emu/cpu/arcompact/arcompact_make.py $@
-
-$(GENDIR)/emu/cpu/h8/h8.inc: $(SRC)/emu/cpu/h8/h8make.py $(SRC)/emu/cpu/h8/h8.lst
- @echo Generating H8-300 source file...
- $(PYTHON) $(SRC)/emu/cpu/h8/h8make.py $(SRC)/emu/cpu/h8/h8.lst o $@
-
-$(GENDIR)/emu/cpu/h8/h8h.inc: $(SRC)/emu/cpu/h8/h8make.py $(SRC)/emu/cpu/h8/h8.lst
- @echo Generating H8-300H source file...
- $(PYTHON) $(SRC)/emu/cpu/h8/h8make.py $(SRC)/emu/cpu/h8/h8.lst h $@
-
-$(GENDIR)/emu/cpu/h8/h8s2000.inc: $(SRC)/emu/cpu/h8/h8make.py $(SRC)/emu/cpu/h8/h8.lst
- @echo Generating H8S/2000 source file...
- $(PYTHON) $(SRC)/emu/cpu/h8/h8make.py $(SRC)/emu/cpu/h8/h8.lst s20 $@
-
-$(GENDIR)/emu/cpu/h8/h8s2600.inc: $(SRC)/emu/cpu/h8/h8make.py $(SRC)/emu/cpu/h8/h8.lst
- @echo Generating H8S/2600 source file...
- $(PYTHON) $(SRC)/emu/cpu/h8/h8make.py $(SRC)/emu/cpu/h8/h8.lst s26 $@
-
-$(GENDIR)/emu/cpu/mcs96/mcs96.inc: $(SRC)/emu/cpu/mcs96/mcs96make.py $(SRC)/emu/cpu/mcs96/mcs96ops.lst
- @echo Generating mcs96 source file...
- $(PYTHON) $(SRC)/emu/cpu/mcs96/mcs96make.py mcs96 $(SRC)/emu/cpu/mcs96/mcs96ops.lst $@
-
-$(GENDIR)/emu/cpu/mcs96/i8x9x.inc: $(SRC)/emu/cpu/mcs96/mcs96make.py $(SRC)/emu/cpu/mcs96/mcs96ops.lst
- @echo Generating i8x9x source file...
- $(PYTHON) $(SRC)/emu/cpu/mcs96/mcs96make.py i8x9x $(SRC)/emu/cpu/mcs96/mcs96ops.lst $@
-
-$(GENDIR)/emu/cpu/mcs96/i8xc196.inc: $(SRC)/emu/cpu/mcs96/mcs96make.py $(SRC)/emu/cpu/mcs96/mcs96ops.lst
- @echo Generating i8xc196 source file...
- $(PYTHON) $(SRC)/emu/cpu/mcs96/mcs96make.py i8xc196 $(SRC)/emu/cpu/mcs96/mcs96ops.lst $@
-
-$(GENDIR)/emu/cpu/m6502/deco16.inc: $(SRC)/emu/cpu/m6502/m6502make.py $(SRC)/emu/cpu/m6502/odeco16.lst $(SRC)/emu/cpu/m6502/ddeco16.lst
- @echo Generating deco16 source file...
- $(PYTHON) $(SRC)/emu/cpu/m6502/m6502make.py deco16_device $(SRC)/emu/cpu/m6502/odeco16.lst $(SRC)/emu/cpu/m6502/ddeco16.lst $@
-
-$(GENDIR)/emu/cpu/m6502/m4510.inc: $(SRC)/emu/cpu/m6502/m6502make.py $(SRC)/emu/cpu/m6502/om4510.lst $(SRC)/emu/cpu/m6502/dm4510.lst
- @echo Generating m4510 source file...
- $(PYTHON) $(SRC)/emu/cpu/m6502/m6502make.py m4510_device $(SRC)/emu/cpu/m6502/om4510.lst $(SRC)/emu/cpu/m6502/dm4510.lst $@
-
-$(GENDIR)/emu/cpu/m6502/m6502.inc: $(SRC)/emu/cpu/m6502/m6502make.py $(SRC)/emu/cpu/m6502/om6502.lst $(SRC)/emu/cpu/m6502/dm6502.lst
- @echo Generating m6502 source file...
- $(PYTHON) $(SRC)/emu/cpu/m6502/m6502make.py m6502_device $(SRC)/emu/cpu/m6502/om6502.lst $(SRC)/emu/cpu/m6502/dm6502.lst $@
-
-$(GENDIR)/emu/cpu/m6502/m65c02.inc: $(SRC)/emu/cpu/m6502/m6502make.py $(SRC)/emu/cpu/m6502/om65c02.lst $(SRC)/emu/cpu/m6502/dm65c02.lst
- @echo Generating m65c02 source file...
- $(PYTHON) $(SRC)/emu/cpu/m6502/m6502make.py m65c02_device $(SRC)/emu/cpu/m6502/om65c02.lst $(SRC)/emu/cpu/m6502/dm65c02.lst $@
-
-$(GENDIR)/emu/cpu/m6502/m65ce02.inc: $(SRC)/emu/cpu/m6502/m6502make.py $(SRC)/emu/cpu/m6502/om65ce02.lst $(SRC)/emu/cpu/m6502/dm65ce02.lst
- @echo Generating m65ce02 source file...
- $(PYTHON) $(SRC)/emu/cpu/m6502/m6502make.py m65ce02_device $(SRC)/emu/cpu/m6502/om65ce02.lst $(SRC)/emu/cpu/m6502/dm65ce02.lst $@
-
-$(GENDIR)/emu/cpu/m6502/m6509.inc: $(SRC)/emu/cpu/m6502/m6502make.py $(SRC)/emu/cpu/m6502/om6509.lst $(SRC)/emu/cpu/m6502/dm6509.lst
- @echo Generating m6509 source file...
- $(PYTHON) $(SRC)/emu/cpu/m6502/m6502make.py m6509_device $(SRC)/emu/cpu/m6502/om6509.lst $(SRC)/emu/cpu/m6502/dm6509.lst $@
-
-$(GENDIR)/emu/cpu/m6502/m6510.inc: $(SRC)/emu/cpu/m6502/m6502make.py $(SRC)/emu/cpu/m6502/om6510.lst $(SRC)/emu/cpu/m6502/dm6510.lst
- @echo Generating m6510 source file...
- $(PYTHON) $(SRC)/emu/cpu/m6502/m6502make.py m6510_device $(SRC)/emu/cpu/m6502/om6510.lst $(SRC)/emu/cpu/m6502/dm6510.lst $@
-
-$(GENDIR)/emu/cpu/m6502/n2a03.inc: $(SRC)/emu/cpu/m6502/m6502make.py $(SRC)/emu/cpu/m6502/on2a03.lst $(SRC)/emu/cpu/m6502/dn2a03.lst
- @echo Generating n2a03 source file...
- $(PYTHON) $(SRC)/emu/cpu/m6502/m6502make.py n2a03_device $(SRC)/emu/cpu/m6502/on2a03.lst $(SRC)/emu/cpu/m6502/dn2a03.lst $@
-
-$(GENDIR)/emu/cpu/m6502/r65c02.inc: $(SRC)/emu/cpu/m6502/m6502make.py $(SRC)/emu/cpu/m6502/dr65c02.lst
- @echo Generating r65c02 source file...
- $(PYTHON) $(SRC)/emu/cpu/m6502/m6502make.py r65c02_device - $(SRC)/emu/cpu/m6502/dr65c02.lst $@
-
-$(GENDIR)/emu/cpu/m6502/m740.inc: $(SRC)/emu/cpu/m6502/m6502make.py $(SRC)/emu/cpu/m6502/om740.lst $(SRC)/emu/cpu/m6502/dm740.lst
- @echo Generating m740 source file...
- $(PYTHON) $(SRC)/emu/cpu/m6502/m6502make.py m740_device $(SRC)/emu/cpu/m6502/om740.lst $(SRC)/emu/cpu/m6502/dm740.lst $@
-
-$(GENDIR)/emu/cpu/m6809/m6809.inc: $(SRC)/emu/cpu/m6809/m6809make.py $(SRC)/emu/cpu/m6809/m6809.ops $(SRC)/emu/cpu/m6809/base6x09.ops
- @echo Generating m6809 source file...
- $(PYTHON) $(SRC)/emu/cpu/m6809/m6809make.py $(SRC)/emu/cpu/m6809/m6809.ops > $@
-
-$(GENDIR)/emu/cpu/m6809/hd6309.inc: $(SRC)/emu/cpu/m6809/m6809make.py $(SRC)/emu/cpu/m6809/hd6309.ops $(SRC)/emu/cpu/m6809/base6x09.ops
- @echo Generating hd6309 source file...
- $(PYTHON) $(SRC)/emu/cpu/m6809/m6809make.py $(SRC)/emu/cpu/m6809/hd6309.ops > $@
-
-$(GENDIR)/emu/cpu/m6809/konami.inc: $(SRC)/emu/cpu/m6809/m6809make.py $(SRC)/emu/cpu/m6809/konami.ops $(SRC)/emu/cpu/m6809/base6x09.ops
- @echo Generating konami source file...
- $(PYTHON) $(SRC)/emu/cpu/m6809/m6809make.py $(SRC)/emu/cpu/m6809/konami.ops > $@
-
-$(GENDIR)/emu/cpu/tms57002/tms57002.inc: $(SRC)/emu/cpu/tms57002/tmsmake.py $(SRC)/emu/cpu/tms57002/tmsinstr.lst
- @echo Generating TMS57002 source file...
- $(PYTHON) $(SRC)/emu/cpu/tms57002/tmsmake.py $(SRC)/emu/cpu/tms57002/tmsinstr.lst $@
-
-$(GENDIR)/mess/drivers/ymmu100.inc: $(SRC)/mess/drivers/ymmu100.ppm $(SRC)/build/file2str.py
- @echo Converting $<...
- @$(PYTHON) $(SRC)/build/file2str.py $(SRC)/mess/drivers/ymmu100.ppm $@ ymmu100_bkg UINT8
-
$(GENDIR)/%.moc.c: $(SRC)/%.h
$(SILENT) $(MOC) $(MOCINCPATH) $< -o $@
diff --git a/scripts/genie.lua b/scripts/genie.lua
index a54f0d4d2a7..9764bd88219 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -39,6 +39,9 @@ function findfunction(x)
end
end
+function layoutbuildtask(_folder, _name)
+ return { MAME_DIR .. "src/".._folder.."/".. _name ..".lay" , GEN_DIR .. _folder .. "/".._name..".lh", { MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting src/".._folder.."/".._name..".lay...", "python $(1) $(<) $(@) layout_".._name }};
+end
CPUS = {}
SOUNDS = {}
@@ -261,8 +264,10 @@ configuration { "Debug", "vs*" }
configuration {}
---aftercompilefile ("\t$(SILENT) gawk -f ../../../../../scripts/depfilter.awk $(@:%.o=%.d) > $(@:%.o=%.dep)\n\t$(SILENT) mv $(@:%.o=%.dep) $(@:%.o=%.d)")
-
+--postcompiletasks {
+-- "gawk -f ../../../../../scripts/depfilter.awk $(@:%.o=%.d) > $(@:%.o=%.dep)",
+-- "mv $(@:%.o=%.dep) $(@:%.o=%.d)",
+--}
msgcompile ("Compiling $(subst ../,,$<)...")
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index c11562ebc3d..6c923a105f8 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -1021,6 +1021,17 @@ if (BUSES["CENTRONICS"]~=null) then
MAME_DIR .. "src/emu/bus/centronics/printer.c",
MAME_DIR .. "src/emu/bus/centronics/digiblst.c",
}
+
+ dependency {
+ { MAME_DIR .. "src/emu/bus/centronics/epson_ex800.c", GEN_DIR .. "emu/layout/ex800.lh" },
+ { MAME_DIR .. "src/emu/bus/centronics/epson_lx800.c", GEN_DIR .. "emu/layout/lx800.lh" },
+ { MAME_DIR .. "src/emu/bus/centronics/epson_lx810l.c", GEN_DIR .. "emu/layout/lx800.lh" },
+ }
+
+ custombuildtask {
+ layoutbuildtask("emu/layout", "ex800"),
+ layoutbuildtask("emu/layout", "lx800"),
+ }
end
---------------------------------------------------
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 6e7002a359c..3669ea334ab 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -76,6 +76,14 @@ if (CPUS["ARCOMPACT"]~=null) then
MAME_DIR .. "src/emu/cpu/arcompact/arcompact.c",
MAME_DIR .. "src/emu/cpu/arcompact/arcompact_execute.c",
}
+ dependency {
+ { MAME_DIR .. "src/emu/cpu/arcompact/arcompact.c", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
+ { MAME_DIR .. "src/emu/cpu/arcompact/arcompact_execute.c", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
+ }
+
+ custombuildtask {
+ { MAME_DIR .. "src/emu/cpu/arcompact/arcompact_make.py" , GEN_DIR .. "emu/cpu/arcompact/arcompact.inc", { MAME_DIR .. "src/emu/cpu/arcompact/arcompact_make.py" }, {"@echo Generating arcompact source .inc files...", "python $(1) $(@)" }},
+ }
end
if (CPUS["ARCOMPACT"]~=null or _OPTIONS["with-tools"]) then
@@ -459,6 +467,20 @@ if (CPUS["H8"]~=null) then
MAME_DIR .. "src/emu/cpu/h8/h8_timer16.c",
MAME_DIR .. "src/emu/cpu/h8/h8_sci.c",
}
+
+ dependency {
+ { MAME_DIR .. "src/emu/cpu/h8/h8.c", GEN_DIR .. "emu/cpu/h8/h8.inc" },
+ { MAME_DIR .. "src/emu/cpu/h8/h8h.c", GEN_DIR .. "emu/cpu/h8/h8h.inc" },
+ { MAME_DIR .. "src/emu/cpu/h8/h8s2000.c", GEN_DIR .. "emu/cpu/h8/h8s2000.inc" },
+ { MAME_DIR .. "src/emu/cpu/h8/h8s2600.c", GEN_DIR .. "emu/cpu/h8/h8s2600.inc" },
+ }
+
+ custombuildtask {
+ { MAME_DIR .. "src/emu/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8.inc", { MAME_DIR .. "src/emu/cpu/h8/h8make.py" }, {"@echo Generating H8-300 source file...", "python $(1) $(<) o $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8h.inc", { MAME_DIR .. "src/emu/cpu/h8/h8make.py" }, {"@echo Generating H8-300H source file...", "python $(1) $(<) h $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2000.inc", { MAME_DIR .. "src/emu/cpu/h8/h8make.py" }, {"@echo Generating H8S/2000 source file...", "python $(1) $(<) s20 $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2600.inc", { MAME_DIR .. "src/emu/cpu/h8/h8make.py" }, {"@echo Generating H8S/2600 source file...", "python $(1) $(<) s26 $(@)" }},
+ }
end
--------------------------------------------------
@@ -689,6 +711,17 @@ if (CPUS["MCS96"]~=null) then
MAME_DIR .. "src/emu/cpu/mcs96/i8x9x.c",
MAME_DIR .. "src/emu/cpu/mcs96/i8xc196.c",
}
+ dependency {
+ { MAME_DIR .. "src/emu/cpu/mcs96/mcs96.c", GEN_DIR .. "emu/cpu/mcs96/mcs96.inc" },
+ { MAME_DIR .. "src/emu/cpu/mcs96/i8x9x.c", GEN_DIR .. "emu/cpu/mcs96/i8x9x.inc" },
+ { MAME_DIR .. "src/emu/cpu/mcs96/i8xc196.c", GEN_DIR .. "emu/cpu/mcs96/i8xc196.inc" },
+ }
+
+ custombuildtask {
+ { MAME_DIR .. "src/emu/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/mcs96.inc", { MAME_DIR .. "src/emu/cpu/mcs96/mcs96make.py" }, {"@echo Generating mcs96 source file...", "python $(1) mcs96 $(<) $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8x9x.inc", { MAME_DIR .. "src/emu/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8x9x source file...", "python $(1) i8x9x $(<) $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8xc196.inc", { MAME_DIR .. "src/emu/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8xc196 source file...", "python $(1) i8xc196 $(<) $(@)" }},
+ }
end
--------------------------------------------------
@@ -958,6 +991,33 @@ if (CPUS["M6502"]~=null) then
MAME_DIR .. "src/emu/cpu/m6502/m3745x.c",
MAME_DIR .. "src/emu/cpu/m6502/m5074x.c",
}
+
+ dependency {
+ { MAME_DIR .. "src/emu/cpu/m6502/deco16.c", GEN_DIR .. "emu/cpu/m6502/deco16.inc" },
+ { MAME_DIR .. "src/emu/cpu/m6502/m4510.c", GEN_DIR .. "emu/cpu/m6502/m4510.inc" },
+ { MAME_DIR .. "src/emu/cpu/m6502/m6502.c", GEN_DIR .. "emu/cpu/m6502/m6502.inc" },
+ { MAME_DIR .. "src/emu/cpu/m6502/m65c02.c", GEN_DIR .. "emu/cpu/m6502/m65c02.inc" },
+ { MAME_DIR .. "src/emu/cpu/m6502/m65ce02.c", GEN_DIR .. "emu/cpu/m6502/m65ce02.inc" },
+ { MAME_DIR .. "src/emu/cpu/m6502/m6509.c", GEN_DIR .. "emu/cpu/m6502/m6509.inc" },
+ { MAME_DIR .. "src/emu/cpu/m6502/m6510.c", GEN_DIR .. "emu/cpu/m6502/m6510.inc" },
+ { MAME_DIR .. "src/emu/cpu/m6502/n2a03.c", GEN_DIR .. "emu/cpu/m6502/n2a03.inc" },
+ { MAME_DIR .. "src/emu/cpu/m6502/r65c02.c", GEN_DIR .. "emu/cpu/m6502/r65c02.inc" },
+ { MAME_DIR .. "src/emu/cpu/m6502/m740.c", GEN_DIR .. "emu/cpu/m6502/m740.inc" },
+ }
+
+ custombuildtask {
+ { MAME_DIR .. "src/emu/cpu/m6502/odeco16.lst", GEN_DIR .. "emu/cpu/m6502/deco16.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/ddeco16.lst" }, {"@echo Generating deco16 source file...", "python $(1) deco16_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/m6502/om4510.lst", GEN_DIR .. "emu/cpu/m6502/m4510.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm4510.lst" }, {"@echo Generating m4510 source file...", "python $(1) m4510_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/m6502/om6502.lst", GEN_DIR .. "emu/cpu/m6502/m6502.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm6502.lst" }, {"@echo Generating m6502 source file...", "python $(1) m6502_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/m6502/om65c02.lst", GEN_DIR .. "emu/cpu/m6502/m65c02.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm65c02.lst" }, {"@echo Generating m65c02 source file...", "python $(1) m65c02_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/m6502/om65ce02.lst",GEN_DIR .. "emu/cpu/m6502/m65ce02.inc",{ MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm65ce02.lst" }, {"@echo Generating m65ce02 source file...", "python $(1) m65ce02_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/m6502/om6509.lst", GEN_DIR .. "emu/cpu/m6502/m6509.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm6509.lst" }, {"@echo Generating m6509 source file...", "python $(1) m6509_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/m6502/om6510.lst", GEN_DIR .. "emu/cpu/m6502/m6510.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm6510.lst" }, {"@echo Generating m6510 source file...", "python $(1) m6510_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/m6502/on2a03.lst", GEN_DIR .. "emu/cpu/m6502/n2a03.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dn2a03.lst" }, {"@echo Generating n2a03 source file...", "python $(1) n2a03_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/m6502/om740.lst" , GEN_DIR .. "emu/cpu/m6502/m740.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py", MAME_DIR .. "src/emu/cpu/m6502/dm740.lst" }, {"@echo Generating m740 source file...", "python $(1) m740_device $(<) $(2) $(@)" }},
+
+ { MAME_DIR .. "src/emu/cpu/m6502/dr65c02.lst", GEN_DIR .. "emu/cpu/m6502/r65c02.inc", { MAME_DIR .. "src/emu/cpu/m6502/m6502make.py" }, {"@echo Generating r65c02 source file...", "python $(1) r65c02_device - $(<) $(@)" }},
+ }
end
--------------------------------------------------
@@ -1003,6 +1063,18 @@ if (CPUS["M6809"]~=null) then
MAME_DIR .. "src/emu/cpu/m6809/hd6309.c",
MAME_DIR .. "src/emu/cpu/m6809/konami.c",
}
+
+ dependency {
+ { MAME_DIR .. "src/emu/cpu/m6809/m6809.c", GEN_DIR .. "emu/cpu/m6809/m6809.inc" },
+ { MAME_DIR .. "src/emu/cpu/m6809/hd6309.c", GEN_DIR .. "emu/cpu/m6809/hd6309.inc" },
+ { MAME_DIR .. "src/emu/cpu/m6809/konami.c", GEN_DIR .. "emu/cpu/m6809/konami.inc" },
+ }
+
+ custombuildtask {
+ { MAME_DIR .. "src/emu/cpu/m6809/m6809.ops" , GEN_DIR .. "emu/cpu/m6809/m6809.inc", { MAME_DIR .. "src/emu/cpu/m6809/m6809make.py" , MAME_DIR .. "src/emu/cpu/m6809/base6x09.ops" }, {"@echo Generating m6809 source file...", "python $(1) $(<) > $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/m6809/hd6309.ops" , GEN_DIR .. "emu/cpu/m6809/hd6309.inc", { MAME_DIR .. "src/emu/cpu/m6809/m6809make.py" , MAME_DIR .. "src/emu/cpu/m6809/base6x09.ops" }, {"@echo Generating hd6309 source file...", "python $(1) $(<) > $(@)" }},
+ { MAME_DIR .. "src/emu/cpu/m6809/konami.ops" , GEN_DIR .. "emu/cpu/m6809/konami.inc", { MAME_DIR .. "src/emu/cpu/m6809/m6809make.py" , MAME_DIR .. "src/emu/cpu/m6809/base6x09.ops" }, {"@echo Generating konami source file...", "python $(1) $(<) > $(@)" }},
+ }
end
if (CPUS["M6809"]~=null or _OPTIONS["with-tools"]) then
@@ -1527,10 +1599,16 @@ if (CPUS["TMS57002"]~=null) then
MAME_DIR .. "src/emu/cpu/tms57002/tms57002.c",
MAME_DIR .. "src/emu/cpu/tms57002/tms57kdec.c",
}
+ dependency {
+ { MAME_DIR .. "src/emu/cpu/tms57002/tms57kdec.c", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" },
+ { MAME_DIR .. "src/emu/cpu/tms57002/tms57002.c", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" },
+ }
end
if (CPUS["TMS57002"]~=null or _OPTIONS["with-tools"]) then
table.insert(disasm_files , MAME_DIR .. "src/emu/cpu/tms57002/57002dsm.c")
+ table.insert(disasm_dependency , { MAME_DIR .. "src/emu/cpu/tms57002/57002dsm.c", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" } )
+ table.insert(disasm_custombuildtask , { MAME_DIR .. "src/emu/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc", { MAME_DIR .. "src/emu/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", "python $(1) $(<) $(@)" }})
end
--------------------------------------------------
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index 66be18e2ff2..36ee46405bc 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -158,10 +158,50 @@ files {
MAME_DIR .. "src/emu/video/vector.c",
}
+dependency {
+ --------------------------------------------------
+ -- additional dependencies
+ --------------------------------------------------
+ { MAME_DIR .. "src/emu/rendfont.c", GEN_DIR .. "emu/uismall.fh" },
+ -------------------------------------------------
+ -- core layouts
+ --------------------------------------------------
+ { MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/dualhovu.lh" },
+ { MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/dualhsxs.lh" },
+ { MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/dualhuov.lh" },
+ { MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/horizont.lh" },
+ { MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/triphsxs.lh" },
+ { MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/quadhsxs.lh" },
+ { MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/vertical.lh" },
+ { MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/lcd.lh" },
+ { MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/lcd_rot.lh" },
+ { MAME_DIR .. "src/emu/rendlay.c", GEN_DIR .. "emu/layout/noscreens.lh" },
+
+ { MAME_DIR .. "src/emu/video.c", GEN_DIR .. "emu/layout/snap.lh" },
+
+}
+
+custombuildtask {
+ { MAME_DIR .. "src/emu/uismall.png" , GEN_DIR .. "emu/uismall.fh", { MAME_DIR.. "src/build/png2bdc.py", MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting uismall.png...", "python $(1) $(<) temp.bdc", "python $(2) temp.bdc $(@) font_uismall UINT8" }},
+
+ layoutbuildtask("emu/layout", "dualhovu"),
+ layoutbuildtask("emu/layout", "dualhsxs"),
+ layoutbuildtask("emu/layout", "dualhuov"),
+ layoutbuildtask("emu/layout", "horizont"),
+ layoutbuildtask("emu/layout", "triphsxs"),
+ layoutbuildtask("emu/layout", "quadhsxs"),
+ layoutbuildtask("emu/layout", "vertical"),
+ layoutbuildtask("emu/layout", "lcd"),
+ layoutbuildtask("emu/layout", "lcd_rot"),
+ layoutbuildtask("emu/layout", "noscreens"),
+ layoutbuildtask("emu/layout", "snap"),
+}
function emuProject(_target, _subtarget)
disasm_files = { }
+ disasm_dependency = { }
+ disasm_custombuildtask = { }
project ("optional")
uuid (os.uuid("optional-" .. _target .."_" .. _subtarget))
@@ -247,5 +287,17 @@ function emuProject(_target, _subtarget)
files {
disasm_files
- }
+ }
+
+ if #disasm_dependency > 0 then
+ dependency {
+ disasm_dependency[1]
+ }
+ end
+
+ if #disasm_custombuildtask > 0 then
+ custombuildtask {
+ disasm_custombuildtask[1]
+ }
+ end
end \ No newline at end of file
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 70da96afe00..b4a247dc88b 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -93,6 +93,26 @@ function mainProject(_target, _subtarget)
MAME_DIR .. "src/version.c",
GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.c",
}
+
+ custombuildtask {
+ { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.c", { MAME_DIR .. "src/build/makelist.py" }, {"@echo Building driver list...", "python $(1) $(<) > $(@)" }},
+ }
+
+ configuration { "mingw*" }
+ custombuildtask {
+ { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _target .. "vers.rc" .. "...", "python $(1) -r -b " .. _target .. " $(<) > $(@)" }},
+ }
+
+ configuration { "vs*" }
+ prebuildcommands {
+ "mkdir " .. path.translate(GEN_DIR .. "/resource/","\\") .. " 2>NUL",
+ "@echo Emitting ".. _target .. "vers.rc...",
+ "python " .. path.translate(MAME_DIR .. "src/build/verinfo.py","\\") .. " -r -b " .. _target .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR .. "/resource/" .. _target .. "vers.rc", "\\") ,
+ }
+
+
+ configuration { }
+
debugdir (MAME_DIR)
debugargs ("-window")
end
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index fcedd0c6710..57aa0d9bb46 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -27,10 +27,16 @@ function maintargetosdoptions(_target)
files {
rcfile,
}
+ dependency {
+ { "$(OBJDIR)/".._target ..".res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true },
+ }
else
files {
MAME_DIR .. "src/osd/windows/mame.rc",
}
+ dependency {
+ { "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true },
+ }
end
end
diff --git a/scripts/target/ldplayer/ldplayer.lua b/scripts/target/ldplayer/ldplayer.lua
index ab3d4280de1..6016debe8fd 100644
--- a/scripts/target/ldplayer/ldplayer.lua
+++ b/scripts/target/ldplayer/ldplayer.lua
@@ -75,6 +75,14 @@ function createProjects_ldplayer_ldplayer(_target, _subtarget)
files{
MAME_DIR .. "src/emu/drivers/emudummy.c",
}
+
+ dependency {
+ { MAME_DIR .. "src/emu/drivers/emudummy.c", GEN_DIR .. "ldplayer/layout/pr8210.lh" },
+ }
+
+ custombuildtask {
+ layoutbuildtask("ldplayer/layout", "pr8210"),
+ }
end
function linkProjects_ldplayer_ldplayer(_target, _subtarget)
diff --git a/scripts/target/mame/tiny.lua b/scripts/target/mame/tiny.lua
index aad7d188dba..b07d59ab217 100644
--- a/scripts/target/mame/tiny.lua
+++ b/scripts/target/mame/tiny.lua
@@ -136,6 +136,28 @@ function createProjects_mame_tiny(_target, _subtarget)
MAME_DIR .. "src/mame/drivers/looping.c",
MAME_DIR .. "src/mame/drivers/supertnk.c",
}
+
+ --------------------------------------------------
+ -- layout dependencies
+ --------------------------------------------------
+
+ dependency {
+ { MAME_DIR .. "src/mame/drivers/astrocde.c", GEN_DIR .. "mame/layout/gorf.lh" },
+ { MAME_DIR .. "src/mame/drivers/astrocde.c", GEN_DIR .. "mame/layout/seawolf2.lh" },
+ { MAME_DIR .. "src/mame/drivers/astrocde.c", GEN_DIR .. "mame/layout/spacezap.lh" },
+ { MAME_DIR .. "src/mame/drivers/astrocde.c", GEN_DIR .. "mame/layout/tenpindx.lh" },
+ { MAME_DIR .. "src/mame/drivers/circus.c", GEN_DIR .. "mame/layout/circus.lh" },
+ { MAME_DIR .. "src/mame/drivers/circus.c", GEN_DIR .. "mame/layout/crash.lh" },
+ }
+
+ custombuildtask {
+ layoutbuildtask("mame/layout", "crash"),
+ layoutbuildtask("mame/layout", "circus"),
+ layoutbuildtask("mame/layout", "tenpindx"),
+ layoutbuildtask("mame/layout", "spacezap"),
+ layoutbuildtask("mame/layout", "seawolf2"),
+ layoutbuildtask("mame/layout", "gorf"),
+ }
end
function linkProjects_mame_tiny(_target, _subtarget)
diff --git a/scripts/target/mess/mess.lua b/scripts/target/mess/mess.lua
index deb933d20a9..9dafb6ae7a8 100644
--- a/scripts/target/mess/mess.lua
+++ b/scripts/target/mess/mess.lua
@@ -2506,6 +2506,12 @@ files {
MAME_DIR .. "src/mess/drivers/ymmu100.c",
MAME_DIR .. "src/mess/drivers/fb01.c",
}
+dependency {
+ { MAME_DIR .. "src/mess/drivers/ymmu100.c", GEN_DIR .. "mess/drivers/ymmu100.inc" },
+}
+custombuildtask {
+ { MAME_DIR .. "src/mess/drivers/ymmu100.ppm", GEN_DIR .. "mess/drivers/ymmu100.inc", { MAME_DIR .. "src/build/file2str.py" }, {"@echo Converting src/drivers/ymmu100.ppm...", "python $(1) $(<) $(@) ymmu100_bkg UINT8" }},
+}
createMESSProjects(_target, _subtarget, "zenith")
files {
diff --git a/src/ume/tiny.lst b/src/ume/tiny.lst
index cfd6af9e92f..a9c92b51f4b 100644
--- a/src/ume/tiny.lst
+++ b/src/ume/tiny.lst
@@ -7,5 +7,5 @@
******************************************************************************/
-#src/mame/tiny.lst
-#src/mess/tiny.lst
+#../../../../../src/mame/tiny.lst
+#../../../../../src/mess/tiny.lst
diff --git a/src/ume/ume.lst b/src/ume/ume.lst
index c92763f35ba..d641a29ffe9 100644
--- a/src/ume/ume.lst
+++ b/src/ume/ume.lst
@@ -7,5 +7,5 @@
******************************************************************************/
-#src/mame/mame.lst
-#src/mess/mess.lst
+#../../../../../src/mame/mame.lst
+#../../../../../src/mess/mess.lst