summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--makefile8
-rw-r--r--scripts/src/bus.lua6
-rw-r--r--scripts/src/cpu.lua230
-rw-r--r--scripts/src/emu.lua2
-rw-r--r--scripts/src/machine.lua6
-rw-r--r--scripts/src/sound.lua18
-rw-r--r--scripts/src/video.lua4
-rw-r--r--scripts/target/mame/arcade.lua50
-rw-r--r--scripts/target/mame/mess.lua16
-rw-r--r--src/devices/bus/nes/nes_ines.hxx (renamed from src/devices/bus/nes/nes_ines.inc)0
-rw-r--r--src/devices/bus/nes/nes_pcb.hxx (renamed from src/devices/bus/nes/nes_pcb.inc)0
-rw-r--r--src/devices/bus/nes/nes_slot.cpp6
-rw-r--r--src/devices/bus/nes/nes_unif.hxx (renamed from src/devices/bus/nes/nes_unif.inc)0
-rw-r--r--src/devices/cpu/adsp2100/2100ops.hxx (renamed from src/devices/cpu/adsp2100/2100ops.inc)0
-rw-r--r--src/devices/cpu/adsp2100/adsp2100.cpp2
-rw-r--r--src/devices/cpu/arcompact/arcompact_execute.cpp2
-rw-r--r--src/devices/cpu/arm7/arm7.cpp4
-rw-r--r--src/devices/cpu/arm7/arm7core.hxx (renamed from src/devices/cpu/arm7/arm7core.inc)0
-rw-r--r--src/devices/cpu/arm7/arm7drc.hxx (renamed from src/devices/cpu/arm7/arm7drc.inc)2
-rw-r--r--src/devices/cpu/arm7/arm7tdrc.hxx (renamed from src/devices/cpu/arm7/arm7tdrc.inc)0
-rw-r--r--src/devices/cpu/cop400/cop400.cpp2
-rw-r--r--src/devices/cpu/cop400/cop400op.hxx (renamed from src/devices/cpu/cop400/cop400op.inc)0
-rw-r--r--src/devices/cpu/dsp16/dsp16.cpp2
-rw-r--r--src/devices/cpu/dsp16/dsp16ops.hxx (renamed from src/devices/cpu/dsp16/dsp16ops.inc)0
-rw-r--r--src/devices/cpu/dsp32/dsp32.cpp2
-rw-r--r--src/devices/cpu/dsp32/dsp32ops.hxx (renamed from src/devices/cpu/dsp32/dsp32ops.inc)0
-rw-r--r--src/devices/cpu/dsp56k/dsp56k.cpp2
-rw-r--r--src/devices/cpu/dsp56k/dsp56ops.hxx (renamed from src/devices/cpu/dsp56k/dsp56ops.inc)0
-rw-r--r--src/devices/cpu/e0c6200/e0c6200.cpp2
-rw-r--r--src/devices/cpu/e0c6200/e0c6200op.hxx (renamed from src/devices/cpu/e0c6200/e0c6200op.inc)0
-rw-r--r--src/devices/cpu/e132xs/e132xs.cpp2
-rw-r--r--src/devices/cpu/e132xs/e132xsop.hxx (renamed from src/devices/cpu/e132xs/e132xsop.inc)0
-rw-r--r--src/devices/cpu/h8/h8.cpp2
-rw-r--r--src/devices/cpu/h8/h8h.cpp2
-rw-r--r--src/devices/cpu/h8/h8s2000.cpp2
-rw-r--r--src/devices/cpu/h8/h8s2600.cpp2
-rw-r--r--src/devices/cpu/i386/i386.cpp12
-rw-r--r--src/devices/cpu/i386/i386op16.hxx (renamed from src/devices/cpu/i386/i386op16.inc)0
-rw-r--r--src/devices/cpu/i386/i386op32.hxx (renamed from src/devices/cpu/i386/i386op32.inc)0
-rw-r--r--src/devices/cpu/i386/i386ops.hxx (renamed from src/devices/cpu/i386/i386ops.inc)0
-rw-r--r--src/devices/cpu/i386/i486ops.hxx (renamed from src/devices/cpu/i386/i486ops.inc)0
-rw-r--r--src/devices/cpu/i386/pentops.hxx (renamed from src/devices/cpu/i386/pentops.inc)0
-rw-r--r--src/devices/cpu/i386/x87ops.hxx (renamed from src/devices/cpu/i386/x87ops.inc)0
-rw-r--r--src/devices/cpu/i860/i860.cpp2
-rw-r--r--src/devices/cpu/i860/i860dec.hxx (renamed from src/devices/cpu/i860/i860dec.inc)0
-rw-r--r--src/devices/cpu/lh5801/5801tbl.hxx (renamed from src/devices/cpu/lh5801/5801tbl.inc)0
-rw-r--r--src/devices/cpu/lh5801/lh5801.cpp2
-rw-r--r--src/devices/cpu/lr35902/lr35902.cpp2
-rw-r--r--src/devices/cpu/lr35902/opc_cb.hxx (renamed from src/devices/cpu/lr35902/opc_cb.inc)0
-rw-r--r--src/devices/cpu/lr35902/opc_main.hxx (renamed from src/devices/cpu/lr35902/opc_main.inc)2
-rw-r--r--src/devices/cpu/m6502/deco16.cpp2
-rw-r--r--src/devices/cpu/m6502/m4510.cpp2
-rw-r--r--src/devices/cpu/m6502/m6502.cpp2
-rw-r--r--src/devices/cpu/m6502/m6509.cpp2
-rw-r--r--src/devices/cpu/m6502/m6510.cpp2
-rw-r--r--src/devices/cpu/m6502/m65c02.cpp2
-rw-r--r--src/devices/cpu/m6502/m65ce02.cpp2
-rw-r--r--src/devices/cpu/m6502/m740.cpp2
-rw-r--r--src/devices/cpu/m6502/n2a03.cpp2
-rw-r--r--src/devices/cpu/m6502/r65c02.cpp2
-rw-r--r--src/devices/cpu/m6800/6800ops.hxx (renamed from src/devices/cpu/m6800/6800ops.inc)0
-rw-r--r--src/devices/cpu/m6800/6800tbl.hxx (renamed from src/devices/cpu/m6800/6800tbl.inc)0
-rw-r--r--src/devices/cpu/m6800/m6800.cpp4
-rw-r--r--src/devices/cpu/m68000/m68kcpu.cpp2
-rw-r--r--src/devices/cpu/m68000/m68kfpu.hxx (renamed from src/devices/cpu/m68000/m68kfpu.inc)0
-rw-r--r--src/devices/cpu/m6805/6805ops.hxx (renamed from src/devices/cpu/m6805/6805ops.inc)0
-rw-r--r--src/devices/cpu/m6805/m6805.cpp2
-rw-r--r--src/devices/cpu/m6809/hd6309.cpp2
-rw-r--r--src/devices/cpu/m6809/konami.cpp2
-rw-r--r--src/devices/cpu/m6809/m6809.cpp2
-rw-r--r--src/devices/cpu/mc68hc11/hc11ops.hxx (renamed from src/devices/cpu/mc68hc11/hc11ops.inc)0
-rw-r--r--src/devices/cpu/mc68hc11/mc68hc11.cpp2
-rw-r--r--src/devices/cpu/mcs51/mcs51.cpp2
-rw-r--r--src/devices/cpu/mcs51/mcs51ops.hxx (renamed from src/devices/cpu/mcs51/mcs51ops.inc)0
-rw-r--r--src/devices/cpu/mcs96/i8x9x.cpp2
-rw-r--r--src/devices/cpu/mcs96/i8xc196.cpp2
-rw-r--r--src/devices/cpu/mcs96/mcs96.cpp2
-rw-r--r--src/devices/cpu/nec/nec.cpp2
-rw-r--r--src/devices/cpu/nec/necinstr.hxx (renamed from src/devices/cpu/nec/necinstr.inc)0
-rw-r--r--src/devices/cpu/nec/v25.cpp4
-rw-r--r--src/devices/cpu/nec/v25instr.hxx (renamed from src/devices/cpu/nec/v25instr.inc)0
-rw-r--r--src/devices/cpu/saturn/satops.hxx (renamed from src/devices/cpu/saturn/satops.inc)0
-rw-r--r--src/devices/cpu/saturn/sattable.hxx (renamed from src/devices/cpu/saturn/sattable.inc)0
-rw-r--r--src/devices/cpu/saturn/saturn.cpp4
-rw-r--r--src/devices/cpu/sc61860/sc61860.cpp4
-rw-r--r--src/devices/cpu/sc61860/scops.hxx (renamed from src/devices/cpu/sc61860/scops.inc)0
-rw-r--r--src/devices/cpu/sc61860/sctable.hxx (renamed from src/devices/cpu/sc61860/sctable.inc)0
-rw-r--r--src/devices/cpu/sharc/compute.hxx (renamed from src/devices/cpu/sharc/compute.inc)0
-rw-r--r--src/devices/cpu/sharc/sharc.cpp6
-rw-r--r--src/devices/cpu/sharc/sharcdma.hxx (renamed from src/devices/cpu/sharc/sharcdma.inc)0
-rw-r--r--src/devices/cpu/sharc/sharcmem.hxx (renamed from src/devices/cpu/sharc/sharcmem.inc)0
-rw-r--r--src/devices/cpu/sharc/sharcops.hxx (renamed from src/devices/cpu/sharc/sharcops.inc)2
-rw-r--r--src/devices/cpu/t11/t11.cpp4
-rw-r--r--src/devices/cpu/t11/t11ops.hxx (renamed from src/devices/cpu/t11/t11ops.inc)0
-rw-r--r--src/devices/cpu/t11/t11table.hxx (renamed from src/devices/cpu/t11/t11table.inc)0
-rw-r--r--src/devices/cpu/tlcs900/900tbl.hxx (renamed from src/devices/cpu/tlcs900/900tbl.inc)0
-rw-r--r--src/devices/cpu/tlcs900/tlcs900.cpp2
-rw-r--r--src/devices/cpu/tms32031/32031ops.hxx (renamed from src/devices/cpu/tms32031/32031ops.inc)0
-rw-r--r--src/devices/cpu/tms32031/tms32031.cpp2
-rw-r--r--src/devices/cpu/tms32051/32051ops.hxx (renamed from src/devices/cpu/tms32051/32051ops.inc)0
-rw-r--r--src/devices/cpu/tms32051/tms32051.cpp2
-rw-r--r--src/devices/cpu/tms34010/34010fld.hxx (renamed from src/devices/cpu/tms34010/34010fld.inc)0
-rw-r--r--src/devices/cpu/tms34010/34010gfx.hxx (renamed from src/devices/cpu/tms34010/34010gfx.inc)40
-rw-r--r--src/devices/cpu/tms34010/34010ops.hxx (renamed from src/devices/cpu/tms34010/34010ops.inc)0
-rw-r--r--src/devices/cpu/tms34010/34010tbl.hxx (renamed from src/devices/cpu/tms34010/34010tbl.inc)0
-rw-r--r--src/devices/cpu/tms34010/tms34010.cpp8
-rw-r--r--src/devices/cpu/tms57002/57002dsm.cpp6
-rw-r--r--src/devices/cpu/tms57002/tms57002.cpp2
-rw-r--r--src/devices/cpu/tms57002/tms57kdec.cpp8
-rw-r--r--src/devices/cpu/tms7000/tms7000.cpp2
-rw-r--r--src/devices/cpu/tms7000/tms70op.hxx (renamed from src/devices/cpu/tms7000/tms70op.inc)0
-rw-r--r--src/devices/cpu/v60/am.hxx (renamed from src/devices/cpu/v60/am.inc)6
-rw-r--r--src/devices/cpu/v60/am1.hxx (renamed from src/devices/cpu/v60/am1.inc)0
-rw-r--r--src/devices/cpu/v60/am2.hxx (renamed from src/devices/cpu/v60/am2.inc)0
-rw-r--r--src/devices/cpu/v60/am3.hxx (renamed from src/devices/cpu/v60/am3.inc)0
-rw-r--r--src/devices/cpu/v60/op12.hxx (renamed from src/devices/cpu/v60/op12.inc)0
-rw-r--r--src/devices/cpu/v60/op2.hxx (renamed from src/devices/cpu/v60/op2.inc)0
-rw-r--r--src/devices/cpu/v60/op3.hxx (renamed from src/devices/cpu/v60/op3.inc)0
-rw-r--r--src/devices/cpu/v60/op4.hxx (renamed from src/devices/cpu/v60/op4.inc)0
-rw-r--r--src/devices/cpu/v60/op5.hxx (renamed from src/devices/cpu/v60/op5.inc)0
-rw-r--r--src/devices/cpu/v60/op6.hxx (renamed from src/devices/cpu/v60/op6.inc)0
-rw-r--r--src/devices/cpu/v60/op7a.hxx (renamed from src/devices/cpu/v60/op7a.inc)0
-rw-r--r--src/devices/cpu/v60/optable.hxx (renamed from src/devices/cpu/v60/optable.inc)0
-rw-r--r--src/devices/cpu/v60/v60.cpp18
-rw-r--r--src/devices/cpu/z180/z180.cpp12
-rw-r--r--src/devices/cpu/z180/z180cb.hxx (renamed from src/devices/cpu/z180/z180cb.inc)0
-rw-r--r--src/devices/cpu/z180/z180dd.hxx (renamed from src/devices/cpu/z180/z180dd.inc)0
-rw-r--r--src/devices/cpu/z180/z180ed.hxx (renamed from src/devices/cpu/z180/z180ed.inc)0
-rw-r--r--src/devices/cpu/z180/z180fd.hxx (renamed from src/devices/cpu/z180/z180fd.inc)0
-rw-r--r--src/devices/cpu/z180/z180op.hxx (renamed from src/devices/cpu/z180/z180op.inc)0
-rw-r--r--src/devices/cpu/z180/z180xy.hxx (renamed from src/devices/cpu/z180/z180xy.inc)0
-rw-r--r--src/devices/cpu/z8/z8.cpp2
-rw-r--r--src/devices/cpu/z8/z8ops.hxx (renamed from src/devices/cpu/z8/z8ops.inc)0
-rw-r--r--src/devices/cpu/z8000/z8000.cpp4
-rw-r--r--src/devices/cpu/z8000/z8000ops.hxx (renamed from src/devices/cpu/z8000/z8000ops.inc)0
-rw-r--r--src/devices/cpu/z8000/z8000tbl.hxx (renamed from src/devices/cpu/z8000/z8000tbl.inc)0
-rw-r--r--src/devices/machine/s3c2400.cpp2
-rw-r--r--src/devices/machine/s3c2410.cpp2
-rw-r--r--src/devices/machine/s3c2440.cpp2
-rw-r--r--src/devices/machine/s3c24xx.hxx (renamed from src/devices/machine/s3c24xx.inc)0
-rw-r--r--src/devices/sound/disc_dev.hxx (renamed from src/devices/sound/disc_dev.inc)0
-rw-r--r--src/devices/sound/disc_flt.hxx (renamed from src/devices/sound/disc_flt.inc)0
-rw-r--r--src/devices/sound/disc_inp.hxx (renamed from src/devices/sound/disc_inp.inc)0
-rw-r--r--src/devices/sound/disc_mth.hxx (renamed from src/devices/sound/disc_mth.inc)0
-rw-r--r--src/devices/sound/disc_sys.hxx (renamed from src/devices/sound/disc_sys.inc)0
-rw-r--r--src/devices/sound/disc_wav.hxx (renamed from src/devices/sound/disc_wav.inc)0
-rw-r--r--src/devices/sound/discrete.cpp12
-rw-r--r--src/devices/sound/tms5110.cpp2
-rw-r--r--src/devices/sound/tms5110r.hxx (renamed from src/devices/sound/tms5110r.inc)0
-rw-r--r--src/devices/sound/tms5220.cpp2
-rw-r--r--src/devices/sound/vlm5030.cpp2
-rw-r--r--src/devices/video/epic12_blit0.cpp130
-rw-r--r--src/devices/video/epic12_blit1.cpp130
-rw-r--r--src/devices/video/epic12_blit2.cpp130
-rw-r--r--src/devices/video/epic12_blit3.cpp130
-rw-r--r--src/devices/video/epic12_blit4.cpp130
-rw-r--r--src/devices/video/epic12_blit5.cpp130
-rw-r--r--src/devices/video/epic12_blit6.cpp130
-rw-r--r--src/devices/video/epic12_blit7.cpp130
-rw-r--r--src/devices/video/epic12_blit8.cpp8
-rw-r--r--src/devices/video/epic12in.hxx (renamed from src/devices/video/epic12in.inc)18
-rw-r--r--src/devices/video/epic12pixel.hxx (renamed from src/devices/video/epic12pixel.inc)0
-rw-r--r--src/devices/video/voodoo.cpp4
-rw-r--r--src/devices/video/voodoo.h2
-rw-r--r--src/devices/video/voodoo_rast.hxx (renamed from src/devices/video/voodoo_rast.inc)0
-rw-r--r--src/emu/rendersw.hxx (renamed from src/emu/rendersw.inc)0
-rw-r--r--src/emu/video.cpp2
-rw-r--r--src/mame/drivers/bfm_ad5.cpp2
-rw-r--r--src/mame/drivers/bfm_ad5sw.hxx (renamed from src/mame/drivers/bfm_ad5sw.inc)0
-rw-r--r--src/mame/drivers/bfm_sc5.cpp2
-rw-r--r--src/mame/drivers/bfm_sc5sw.hxx (renamed from src/mame/drivers/bfm_sc5sw.inc)0
-rw-r--r--src/mame/drivers/maygay1b.cpp2
-rw-r--r--src/mame/drivers/maygay1b.hxx (renamed from src/mame/drivers/maygay1b.inc)0
-rw-r--r--src/mame/drivers/mpu4.cpp24
-rw-r--r--src/mame/drivers/mpu4.hxx (renamed from src/mame/drivers/mpu4.inc)0
-rw-r--r--src/mame/drivers/mpu4avan.hxx (renamed from src/mame/drivers/mpu4avan.inc)0
-rw-r--r--src/mame/drivers/mpu4bwb.hxx (renamed from src/mame/drivers/mpu4bwb.inc)0
-rw-r--r--src/mame/drivers/mpu4concept.hxx (renamed from src/mame/drivers/mpu4concept.inc)0
-rw-r--r--src/mame/drivers/mpu4crystal.hxx (renamed from src/mame/drivers/mpu4crystal.inc)0
-rw-r--r--src/mame/drivers/mpu4empire.hxx (renamed from src/mame/drivers/mpu4empire.inc)0
-rw-r--r--src/mame/drivers/mpu4mdm.hxx (renamed from src/mame/drivers/mpu4mdm.inc)0
-rw-r--r--src/mame/drivers/mpu4misc.hxx (renamed from src/mame/drivers/mpu4misc.inc)0
-rw-r--r--src/mame/drivers/mpu4mod2sw.hxx (renamed from src/mame/drivers/mpu4mod2sw.inc)0
-rw-r--r--src/mame/drivers/mpu4mod4yam.hxx (renamed from src/mame/drivers/mpu4mod4yam.inc)0
-rw-r--r--src/mame/drivers/mpu4sw.hxx (renamed from src/mame/drivers/mpu4sw.inc)0
-rw-r--r--src/mame/drivers/mpu4union.hxx (renamed from src/mame/drivers/mpu4union.inc)0
-rw-r--r--src/mame/drivers/mpu5.cpp2
-rw-r--r--src/mame/drivers/mpu5.hxx (renamed from src/mame/drivers/mpu5.inc)0
-rw-r--r--src/mame/drivers/multfish_ref.hxx (renamed from src/mame/drivers/multfish_ref.inc)0
-rw-r--r--src/mame/drivers/neodriv.hxx (renamed from src/mame/drivers/neodriv.inc)0
-rw-r--r--src/mame/drivers/neogeo.cpp2
-rw-r--r--src/mame/drivers/palm.cpp2
-rw-r--r--src/mame/drivers/palm_dbg.hxx (renamed from src/mame/drivers/palm_dbg.inc)0
-rw-r--r--src/mame/drivers/unkfr.hxx (renamed from src/mame/drivers/unkfr.inc)0
-rw-r--r--src/mame/drivers/ymmu100.cpp2
-rw-r--r--src/mame/includes/model2.h16
-rw-r--r--src/mame/machine/cx4data.hxx (renamed from src/mame/machine/cx4data.inc)0
-rw-r--r--src/mame/machine/cx4fn.hxx (renamed from src/mame/machine/cx4fn.inc)0
-rw-r--r--src/mame/machine/cx4oam.hxx (renamed from src/mame/machine/cx4oam.inc)0
-rw-r--r--src/mame/machine/cx4ops.hxx (renamed from src/mame/machine/cx4ops.inc)0
-rw-r--r--src/mame/machine/snescx4.cpp8
-rw-r--r--src/mame/video/hng64.cpp4
-rw-r--r--src/mame/video/hng64_3d.hxx (renamed from src/mame/video/hng64_3d.inc)0
-rw-r--r--src/mame/video/hng64_sprite.hxx (renamed from src/mame/video/hng64_sprite.inc)0
-rw-r--r--src/mame/video/jagblit.hxx (renamed from src/mame/video/jagblit.inc)2
-rw-r--r--src/mame/video/jagobj.hxx (renamed from src/mame/video/jagobj.inc)0
-rw-r--r--src/mame/video/jaguar.cpp20
-rw-r--r--src/mame/video/model2rd.hxx (renamed from src/mame/video/model2rd.inc)0
-rw-r--r--src/mame/video/n64.cpp2
-rw-r--r--src/mame/video/rdpfiltr.hxx (renamed from src/mame/video/rdpfiltr.inc)0
-rw-r--r--src/osd/modules/render/drawgdi.cpp2
-rw-r--r--src/osd/modules/render/drawsdl.cpp2
-rw-r--r--src/tools/srcclean.cpp2
213 files changed, 887 insertions, 887 deletions
diff --git a/makefile b/makefile
index b399c13923a..1dd0f57217d 100644
--- a/makefile
+++ b/makefile
@@ -1459,7 +1459,7 @@ generate: \
$(GEN_FOLDERS) \
$(patsubst %.po,%.mo,$(call rwildcard, language/, *.po)) \
$(patsubst $(SRC)/%.lay,$(GENDIR)/%.lh,$(LAYOUTS)) \
- $(GENDIR)/mame/drivers/ymmu100.inc \
+ $(GENDIR)/mame/drivers/ymmu100.hxx \
$(SRC)/devices/cpu/m68000/m68kops.cpp \
$(GENDIR)/includes/SDL2
@@ -1471,7 +1471,7 @@ $(GENDIR)/%.lh: $(SRC)/%.lay scripts/build/complay.py | $(GEN_FOLDERS)
@echo Compressing $<...
$(SILENT)$(PYTHON) scripts/build/complay.py $< $@ layout_$(basename $(notdir $<))
-$(GENDIR)/mame/drivers/ymmu100.inc: $(SRC)/mame/drivers/ymmu100.ppm scripts/build/file2str.py
+$(GENDIR)/mame/drivers/ymmu100.hxx: $(SRC)/mame/drivers/ymmu100.ppm scripts/build/file2str.py
@echo Converting $<...
$(SILENT)$(PYTHON) scripts/build/file2str.py $< $@ ymmu100_bkg UINT8
@@ -1513,7 +1513,7 @@ ifeq ($(OS),windows)
$(shell for /r src %%i in (*.mak) do srcclean %%i >&2 )
$(shell for /r src %%i in (*.lst) do srcclean %%i >&2 )
$(shell for /r src %%i in (*.lay) do srcclean %%i >&2 )
- $(shell for /r src %%i in (*.inc) do srcclean %%i >&2 )
+ $(shell for /r src %%i in (*.hxx) do srcclean %%i >&2 )
$(shell for /r hash %%i in (*.xml) do srcclean %%i >&2 )
else
$(shell find src/ -name *.c -exec ./srcclean {} >&2 ;)
@@ -1521,7 +1521,7 @@ else
$(shell find src/ -name *.mak -exec ./srcclean {} >&2 ;)
$(shell find src/ -name *.lst -exec ./srcclean {} >&2 ;)
$(shell find src/ -name *.lay -exec ./srcclean {} >&2 ;)
- $(shell find src/ -name *.inc -exec ./srcclean {} >&2 ;)
+ $(shell find src/ -name *.hxx -exec ./srcclean {} >&2 ;)
$(shell find hash/ -name *.xml -exec ./srcclean {} >&2 ;)
endif
diff --git a/scripts/src/bus.lua b/scripts/src/bus.lua
index 7b749fd2926..3da1e88cb3c 100644
--- a/scripts/src/bus.lua
+++ b/scripts/src/bus.lua
@@ -1634,9 +1634,9 @@ if (BUSES["NES"]~=null) then
files {
MAME_DIR .. "src/devices/bus/nes/nes_slot.cpp",
MAME_DIR .. "src/devices/bus/nes/nes_slot.h",
- MAME_DIR .. "src/devices/bus/nes/nes_ines.inc",
- MAME_DIR .. "src/devices/bus/nes/nes_pcb.inc",
- MAME_DIR .. "src/devices/bus/nes/nes_unif.inc",
+ MAME_DIR .. "src/devices/bus/nes/nes_ines.hxx",
+ MAME_DIR .. "src/devices/bus/nes/nes_pcb.hxx",
+ MAME_DIR .. "src/devices/bus/nes/nes_unif.hxx",
MAME_DIR .. "src/devices/bus/nes/nes_carts.cpp",
MAME_DIR .. "src/devices/bus/nes/nes_carts.h",
MAME_DIR .. "src/devices/bus/nes/2a03pur.cpp",
diff --git a/scripts/src/cpu.lua b/scripts/src/cpu.lua
index 53f09b3abc0..5bb90325fa6 100644
--- a/scripts/src/cpu.lua
+++ b/scripts/src/cpu.lua
@@ -86,12 +86,12 @@ if (CPUS["ARCOMPACT"]~=null) then
MAME_DIR .. "src/devices/cpu/arcompact/arcompact_common.h",
}
dependency {
- { MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
- { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" },
+ { MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.hxx" },
+ { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.hxx" },
}
custombuildtask {
- { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_make.py" , GEN_DIR .. "emu/cpu/arcompact/arcompact.inc", { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_make.py" }, {"@echo Generating arcompact source .inc files...", PYTHON .. " $(1) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_make.py" , GEN_DIR .. "emu/cpu/arcompact/arcompact.hxx", { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_make.py" }, {"@echo Generating ARCOMPACT source files...", PYTHON .. " $(1) $(@)" }},
}
end
@@ -129,10 +129,10 @@ if (CPUS["ARM7"]~=null) then
MAME_DIR .. "src/devices/cpu/arm7/lpc210x.cpp",
MAME_DIR .. "src/devices/cpu/arm7/lpc210x.h",
MAME_DIR .. "src/devices/cpu/arm7/arm7core.h",
- MAME_DIR .. "src/devices/cpu/arm7/arm7core.inc",
- MAME_DIR .. "src/devices/cpu/arm7/arm7drc.inc",
+ MAME_DIR .. "src/devices/cpu/arm7/arm7core.hxx",
+ MAME_DIR .. "src/devices/cpu/arm7/arm7drc.hxx",
MAME_DIR .. "src/devices/cpu/arm7/arm7help.h",
- MAME_DIR .. "src/devices/cpu/arm7/arm7tdrc.inc",
+ MAME_DIR .. "src/devices/cpu/arm7/arm7tdrc.hxx",
}
end
@@ -198,7 +198,7 @@ if (CPUS["ADSP21XX"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/adsp2100/adsp2100.cpp",
MAME_DIR .. "src/devices/cpu/adsp2100/adsp2100.h",
- MAME_DIR .. "src/devices/cpu/adsp2100/2100ops.inc",
+ MAME_DIR .. "src/devices/cpu/adsp2100/2100ops.hxx",
}
end
@@ -215,12 +215,12 @@ if (CPUS["ADSP21062"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/sharc/sharc.cpp",
MAME_DIR .. "src/devices/cpu/sharc/sharc.h",
- MAME_DIR .. "src/devices/cpu/sharc/compute.inc",
- MAME_DIR .. "src/devices/cpu/sharc/sharcdma.inc",
+ MAME_DIR .. "src/devices/cpu/sharc/compute.hxx",
+ MAME_DIR .. "src/devices/cpu/sharc/sharcdma.hxx",
MAME_DIR .. "src/devices/cpu/sharc/sharcdsm.h",
- MAME_DIR .. "src/devices/cpu/sharc/sharcmem.inc",
+ MAME_DIR .. "src/devices/cpu/sharc/sharcmem.hxx",
MAME_DIR .. "src/devices/cpu/sharc/sharcops.h",
- MAME_DIR .. "src/devices/cpu/sharc/sharcops.inc",
+ MAME_DIR .. "src/devices/cpu/sharc/sharcops.hxx",
}
end
@@ -253,7 +253,7 @@ if (CPUS["DSP16A"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/dsp16/dsp16.cpp",
MAME_DIR .. "src/devices/cpu/dsp16/dsp16.h",
- MAME_DIR .. "src/devices/cpu/dsp16/dsp16ops.inc",
+ MAME_DIR .. "src/devices/cpu/dsp16/dsp16ops.hxx",
}
end
@@ -270,7 +270,7 @@ if (CPUS["DSP32C"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/dsp32/dsp32.cpp",
MAME_DIR .. "src/devices/cpu/dsp32/dsp32.h",
- MAME_DIR .. "src/devices/cpu/dsp32/dsp32ops.inc",
+ MAME_DIR .. "src/devices/cpu/dsp32/dsp32ops.hxx",
}
end
@@ -382,7 +382,7 @@ if (CPUS["E0C6200"]~=null) then
MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200.h",
MAME_DIR .. "src/devices/cpu/e0c6200/e0c6s46.cpp",
MAME_DIR .. "src/devices/cpu/e0c6200/e0c6s46.h",
- MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200op.inc",
+ MAME_DIR .. "src/devices/cpu/e0c6200/e0c6200op.hxx",
}
end
@@ -415,7 +415,7 @@ if (CPUS["COP400"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/cop400/cop400.cpp",
MAME_DIR .. "src/devices/cpu/cop400/cop400.h",
- MAME_DIR .. "src/devices/cpu/cop400/cop400op.inc",
+ MAME_DIR .. "src/devices/cpu/cop400/cop400op.hxx",
}
end
@@ -466,8 +466,8 @@ if (CPUS["T11"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/t11/t11.cpp",
MAME_DIR .. "src/devices/cpu/t11/t11.h",
- MAME_DIR .. "src/devices/cpu/t11/t11ops.inc",
- MAME_DIR .. "src/devices/cpu/t11/t11table.inc",
+ MAME_DIR .. "src/devices/cpu/t11/t11ops.hxx",
+ MAME_DIR .. "src/devices/cpu/t11/t11table.hxx",
}
end
@@ -585,17 +585,17 @@ if (CPUS["H8"]~=null) then
}
dependency {
- { MAME_DIR .. "src/devices/cpu/h8/h8.cpp", GEN_DIR .. "emu/cpu/h8/h8.inc" },
- { MAME_DIR .. "src/devices/cpu/h8/h8h.cpp", GEN_DIR .. "emu/cpu/h8/h8h.inc" },
- { MAME_DIR .. "src/devices/cpu/h8/h8s2000.cpp", GEN_DIR .. "emu/cpu/h8/h8s2000.inc" },
- { MAME_DIR .. "src/devices/cpu/h8/h8s2600.cpp", GEN_DIR .. "emu/cpu/h8/h8s2600.inc" },
+ { MAME_DIR .. "src/devices/cpu/h8/h8.cpp", GEN_DIR .. "emu/cpu/h8/h8.hxx" },
+ { MAME_DIR .. "src/devices/cpu/h8/h8h.cpp", GEN_DIR .. "emu/cpu/h8/h8h.hxx" },
+ { MAME_DIR .. "src/devices/cpu/h8/h8s2000.cpp", GEN_DIR .. "emu/cpu/h8/h8s2000.hxx" },
+ { MAME_DIR .. "src/devices/cpu/h8/h8s2600.cpp", GEN_DIR .. "emu/cpu/h8/h8s2600.hxx" },
}
custombuildtask {
- { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8.inc", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300 source file...", PYTHON .. " $(1) $(<) o $(@)" }},
- { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8h.inc", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300H source file...", PYTHON .. " $(1) $(<) h $(@)" }},
- { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2000.inc", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2000 source file...", PYTHON .. " $(1) $(<) s20 $(@)" }},
- { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2600.inc", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2600 source file...", PYTHON .. " $(1) $(<) s26 $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300 source file...", PYTHON .. " $(1) $(<) o $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8h.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8-300H source file...", PYTHON .. " $(1) $(<) h $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2000.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2000 source file...", PYTHON .. " $(1) $(<) s20 $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/h8/h8.lst" , GEN_DIR .. "emu/cpu/h8/h8s2600.hxx", { MAME_DIR .. "src/devices/cpu/h8/h8make.py" }, {"@echo Generating H8S/2600 source file...", PYTHON .. " $(1) $(<) s26 $(@)" }},
}
end
@@ -719,7 +719,7 @@ if (CPUS["E1"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/e132xs/e132xs.cpp",
MAME_DIR .. "src/devices/cpu/e132xs/e132xs.h",
- MAME_DIR .. "src/devices/cpu/e132xs/e132xsop.inc",
+ MAME_DIR .. "src/devices/cpu/e132xs/e132xsop.hxx",
}
end
@@ -852,7 +852,7 @@ if (CPUS["MCS51"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/mcs51/mcs51.cpp",
MAME_DIR .. "src/devices/cpu/mcs51/mcs51.h",
- MAME_DIR .. "src/devices/cpu/mcs51/mcs51ops.inc",
+ MAME_DIR .. "src/devices/cpu/mcs51/mcs51ops.hxx",
}
end
@@ -875,15 +875,15 @@ if (CPUS["MCS96"]~=null) then
MAME_DIR .. "src/devices/cpu/mcs96/i8xc196.h",
}
dependency {
- { MAME_DIR .. "src/devices/cpu/mcs96/mcs96.cpp", GEN_DIR .. "emu/cpu/mcs96/mcs96.inc" },
- { MAME_DIR .. "src/devices/cpu/mcs96/i8x9x.cpp", GEN_DIR .. "emu/cpu/mcs96/i8x9x.inc" },
- { MAME_DIR .. "src/devices/cpu/mcs96/i8xc196.cpp", GEN_DIR .. "emu/cpu/mcs96/i8xc196.inc" },
+ { MAME_DIR .. "src/devices/cpu/mcs96/mcs96.cpp", GEN_DIR .. "emu/cpu/mcs96/mcs96.hxx" },
+ { MAME_DIR .. "src/devices/cpu/mcs96/i8x9x.cpp", GEN_DIR .. "emu/cpu/mcs96/i8x9x.hxx" },
+ { MAME_DIR .. "src/devices/cpu/mcs96/i8xc196.cpp", GEN_DIR .. "emu/cpu/mcs96/i8xc196.hxx" },
}
custombuildtask {
- { MAME_DIR .. "src/devices/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/mcs96.inc", { MAME_DIR .. "src/devices/cpu/mcs96/mcs96make.py" }, {"@echo Generating mcs96 source file...", PYTHON .. " $(1) mcs96 $(<) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8x9x.inc", { MAME_DIR .. "src/devices/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8x9x source file...", PYTHON .. " $(1) i8x9x $(<) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8xc196.inc", { MAME_DIR .. "src/devices/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8xc196 source file...", PYTHON .. " $(1) i8xc196 $(<) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/mcs96.hxx", { MAME_DIR .. "src/devices/cpu/mcs96/mcs96make.py" }, {"@echo Generating mcs96 source file...", PYTHON .. " $(1) mcs96 $(<) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8x9x.hxx", { MAME_DIR .. "src/devices/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8x9x source file...", PYTHON .. " $(1) i8x9x $(<) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/mcs96/mcs96ops.lst" , GEN_DIR .. "emu/cpu/mcs96/i8xc196.hxx", { MAME_DIR .. "src/devices/cpu/mcs96/mcs96make.py" }, {"@echo Generating i8xc196 source file...", PYTHON .. " $(1) i8xc196 $(<) $(@)" }},
}
end
@@ -915,14 +915,14 @@ if (CPUS["I386"]~=null) then
MAME_DIR .. "src/devices/cpu/i386/i386.cpp",
MAME_DIR .. "src/devices/cpu/i386/i386.h",
MAME_DIR .. "src/devices/cpu/i386/cycles.h",
- MAME_DIR .. "src/devices/cpu/i386/i386op16.inc",
- MAME_DIR .. "src/devices/cpu/i386/i386op32.inc",
+ MAME_DIR .. "src/devices/cpu/i386/i386op16.hxx",
+ MAME_DIR .. "src/devices/cpu/i386/i386op32.hxx",
MAME_DIR .. "src/devices/cpu/i386/i386ops.h",
- MAME_DIR .. "src/devices/cpu/i386/i386ops.inc",
+ MAME_DIR .. "src/devices/cpu/i386/i386ops.hxx",
MAME_DIR .. "src/devices/cpu/i386/i386priv.h",
- MAME_DIR .. "src/devices/cpu/i386/i486ops.inc",
- MAME_DIR .. "src/devices/cpu/i386/pentops.inc",
- MAME_DIR .. "src/devices/cpu/i386/x87ops.inc",
+ MAME_DIR .. "src/devices/cpu/i386/i486ops.hxx",
+ MAME_DIR .. "src/devices/cpu/i386/pentops.hxx",
+ MAME_DIR .. "src/devices/cpu/i386/x87ops.hxx",
}
end
@@ -940,7 +940,7 @@ if (CPUS["I860"]~=null) then
MAME_DIR .. "src/devices/cpu/i860/i860.cpp",
MAME_DIR .. "src/devices/cpu/i860/i860.h",
--MAME_DIR .. "src/devices/cpu/i860/i860dasm.cpp",
- MAME_DIR .. "src/devices/cpu/i860/i860dec.inc",
+ MAME_DIR .. "src/devices/cpu/i860/i860dec.hxx",
}
end
@@ -974,7 +974,7 @@ if (CPUS["LH5801"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/lh5801/lh5801.cpp",
MAME_DIR .. "src/devices/cpu/lh5801/lh5801.h",
- MAME_DIR .. "src/devices/cpu/lh5801/5801tbl.inc",
+ MAME_DIR .. "src/devices/cpu/lh5801/5801tbl.hxx",
}
end
@@ -1253,30 +1253,30 @@ if (CPUS["M6502"]~=null) then
}
dependency {
- { MAME_DIR .. "src/devices/cpu/m6502/deco16.cpp", GEN_DIR .. "emu/cpu/m6502/deco16.inc" },
- { MAME_DIR .. "src/devices/cpu/m6502/m4510.cpp", GEN_DIR .. "emu/cpu/m6502/m4510.inc" },
- { MAME_DIR .. "src/devices/cpu/m6502/m6502.cpp", GEN_DIR .. "emu/cpu/m6502/m6502.inc" },
- { MAME_DIR .. "src/devices/cpu/m6502/m65c02.cpp", GEN_DIR .. "emu/cpu/m6502/m65c02.inc" },
- { MAME_DIR .. "src/devices/cpu/m6502/m65ce02.cpp", GEN_DIR .. "emu/cpu/m6502/m65ce02.inc" },
- { MAME_DIR .. "src/devices/cpu/m6502/m6509.cpp", GEN_DIR .. "emu/cpu/m6502/m6509.inc" },
- { MAME_DIR .. "src/devices/cpu/m6502/m6510.cpp", GEN_DIR .. "emu/cpu/m6502/m6510.inc" },
- { MAME_DIR .. "src/devices/cpu/m6502/n2a03.cpp", GEN_DIR .. "emu/cpu/m6502/n2a03.inc" },
- { MAME_DIR .. "src/devices/cpu/m6502/r65c02.cpp", GEN_DIR .. "emu/cpu/m6502/r65c02.inc" },
- { MAME_DIR .. "src/devices/cpu/m6502/m740.cpp", GEN_DIR .. "emu/cpu/m6502/m740.inc" },
+ { MAME_DIR .. "src/devices/cpu/m6502/deco16.cpp", GEN_DIR .. "emu/cpu/m6502/deco16.hxx" },
+ { MAME_DIR .. "src/devices/cpu/m6502/m4510.cpp", GEN_DIR .. "emu/cpu/m6502/m4510.hxx" },
+ { MAME_DIR .. "src/devices/cpu/m6502/m6502.cpp", GEN_DIR .. "emu/cpu/m6502/m6502.hxx" },
+ { MAME_DIR .. "src/devices/cpu/m6502/m65c02.cpp", GEN_DIR .. "emu/cpu/m6502/m65c02.hxx" },
+ { MAME_DIR .. "src/devices/cpu/m6502/m65ce02.cpp", GEN_DIR .. "emu/cpu/m6502/m65ce02.hxx" },
+ { MAME_DIR .. "src/devices/cpu/m6502/m6509.cpp", GEN_DIR .. "emu/cpu/m6502/m6509.hxx" },
+ { MAME_DIR .. "src/devices/cpu/m6502/m6510.cpp", GEN_DIR .. "emu/cpu/m6502/m6510.hxx" },
+ { MAME_DIR .. "src/devices/cpu/m6502/n2a03.cpp", GEN_DIR .. "emu/cpu/m6502/n2a03.hxx" },
+ { MAME_DIR .. "src/devices/cpu/m6502/r65c02.cpp", GEN_DIR .. "emu/cpu/m6502/r65c02.hxx" },
+ { MAME_DIR .. "src/devices/cpu/m6502/m740.cpp", GEN_DIR .. "emu/cpu/m6502/m740.hxx" },
}
custombuildtask {
- { MAME_DIR .. "src/devices/cpu/m6502/odeco16.lst", GEN_DIR .. "emu/cpu/m6502/deco16.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/ddeco16.lst" }, {"@echo Generating deco16 source file...", PYTHON .. " $(1) deco16_device $(<) $(2) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6502/om4510.lst", GEN_DIR .. "emu/cpu/m6502/m4510.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm4510.lst" }, {"@echo Generating m4510 source file...", PYTHON .. " $(1) m4510_device $(<) $(2) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6502/om6502.lst", GEN_DIR .. "emu/cpu/m6502/m6502.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6502.lst" }, {"@echo Generating m6502 source file...", PYTHON .. " $(1) m6502_device $(<) $(2) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6502/om65c02.lst", GEN_DIR .. "emu/cpu/m6502/m65c02.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm65c02.lst" }, {"@echo Generating m65c02 source file...", PYTHON .. " $(1) m65c02_device $(<) $(2) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6502/om65ce02.lst",GEN_DIR .. "emu/cpu/m6502/m65ce02.inc",{ MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm65ce02.lst" }, {"@echo Generating m65ce02 source file...", PYTHON .. " $(1) m65ce02_device $(<) $(2) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6502/om6509.lst", GEN_DIR .. "emu/cpu/m6502/m6509.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6509.lst" }, {"@echo Generating m6509 source file...", PYTHON .. " $(1) m6509_device $(<) $(2) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6502/om6510.lst", GEN_DIR .. "emu/cpu/m6502/m6510.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6510.lst" }, {"@echo Generating m6510 source file...", PYTHON .. " $(1) m6510_device $(<) $(2) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6502/on2a03.lst", GEN_DIR .. "emu/cpu/m6502/n2a03.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dn2a03.lst" }, {"@echo Generating n2a03 source file...", PYTHON .. " $(1) n2a03_device $(<) $(2) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6502/om740.lst" , GEN_DIR .. "emu/cpu/m6502/m740.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm740.lst" }, {"@echo Generating m740 source file...", PYTHON .. " $(1) m740_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6502/odeco16.lst", GEN_DIR .. "emu/cpu/m6502/deco16.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/ddeco16.lst" }, {"@echo Generating deco16 source file...", PYTHON .. " $(1) deco16_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6502/om4510.lst", GEN_DIR .. "emu/cpu/m6502/m4510.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm4510.lst" }, {"@echo Generating m4510 source file...", PYTHON .. " $(1) m4510_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6502/om6502.lst", GEN_DIR .. "emu/cpu/m6502/m6502.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6502.lst" }, {"@echo Generating m6502 source file...", PYTHON .. " $(1) m6502_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6502/om65c02.lst", GEN_DIR .. "emu/cpu/m6502/m65c02.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm65c02.lst" }, {"@echo Generating m65c02 source file...", PYTHON .. " $(1) m65c02_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6502/om65ce02.lst",GEN_DIR .. "emu/cpu/m6502/m65ce02.hxx",{ MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm65ce02.lst" }, {"@echo Generating m65ce02 source file...", PYTHON .. " $(1) m65ce02_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6502/om6509.lst", GEN_DIR .. "emu/cpu/m6502/m6509.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6509.lst" }, {"@echo Generating m6509 source file...", PYTHON .. " $(1) m6509_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6502/om6510.lst", GEN_DIR .. "emu/cpu/m6502/m6510.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm6510.lst" }, {"@echo Generating m6510 source file...", PYTHON .. " $(1) m6510_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6502/on2a03.lst", GEN_DIR .. "emu/cpu/m6502/n2a03.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dn2a03.lst" }, {"@echo Generating n2a03 source file...", PYTHON .. " $(1) n2a03_device $(<) $(2) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6502/om740.lst" , GEN_DIR .. "emu/cpu/m6502/m740.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py", MAME_DIR .. "src/devices/cpu/m6502/dm740.lst" }, {"@echo Generating m740 source file...", PYTHON .. " $(1) m740_device $(<) $(2) $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6502/dr65c02.lst", GEN_DIR .. "emu/cpu/m6502/r65c02.inc", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py" }, {"@echo Generating r65c02 source file...", PYTHON .. " $(1) r65c02_device - $(<) $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6502/dr65c02.lst", GEN_DIR .. "emu/cpu/m6502/r65c02.hxx", { MAME_DIR .. "src/devices/cpu/m6502/m6502make.py" }, {"@echo Generating r65c02 source file...", PYTHON .. " $(1) r65c02_device - $(<) $(@)" }},
}
end
@@ -1289,8 +1289,8 @@ if (CPUS["M6800"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/m6800/m6800.cpp",
MAME_DIR .. "src/devices/cpu/m6800/m6800.h",
- MAME_DIR .. "src/devices/cpu/m6800/6800ops.inc",
- MAME_DIR .. "src/devices/cpu/m6800/6800tbl.inc",
+ MAME_DIR .. "src/devices/cpu/m6800/6800ops.hxx",
+ MAME_DIR .. "src/devices/cpu/m6800/6800tbl.hxx",
}
end
@@ -1307,7 +1307,7 @@ if (CPUS["M6805"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/m6805/m6805.cpp",
MAME_DIR .. "src/devices/cpu/m6805/m6805.h",
- MAME_DIR .. "src/devices/cpu/m6805/6805ops.inc",
+ MAME_DIR .. "src/devices/cpu/m6805/6805ops.hxx",
}
end
@@ -1334,15 +1334,15 @@ if (CPUS["M6809"]~=null) then
}
dependency {
- { MAME_DIR .. "src/devices/cpu/m6809/m6809.cpp", GEN_DIR .. "emu/cpu/m6809/m6809.inc" },
- { MAME_DIR .. "src/devices/cpu/m6809/hd6309.cpp", GEN_DIR .. "emu/cpu/m6809/hd6309.inc" },
- { MAME_DIR .. "src/devices/cpu/m6809/konami.cpp", GEN_DIR .. "emu/cpu/m6809/konami.inc" },
+ { MAME_DIR .. "src/devices/cpu/m6809/m6809.cpp", GEN_DIR .. "emu/cpu/m6809/m6809.hxx" },
+ { MAME_DIR .. "src/devices/cpu/m6809/hd6309.cpp", GEN_DIR .. "emu/cpu/m6809/hd6309.hxx" },
+ { MAME_DIR .. "src/devices/cpu/m6809/konami.cpp", GEN_DIR .. "emu/cpu/m6809/konami.hxx" },
}
custombuildtask {
- { MAME_DIR .. "src/devices/cpu/m6809/m6809.ops" , GEN_DIR .. "emu/cpu/m6809/m6809.inc", { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py" , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops" }, {"@echo Generating m6809 source file...", PYTHON .. " $(1) $(<) > $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6809/hd6309.ops" , GEN_DIR .. "emu/cpu/m6809/hd6309.inc", { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py" , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops" }, {"@echo Generating hd6309 source file...", PYTHON .. " $(1) $(<) > $(@)" }},
- { MAME_DIR .. "src/devices/cpu/m6809/konami.ops" , GEN_DIR .. "emu/cpu/m6809/konami.inc", { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py" , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops" }, {"@echo Generating konami source file...", PYTHON .. " $(1) $(<) > $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6809/m6809.ops" , GEN_DIR .. "emu/cpu/m6809/m6809.hxx", { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py" , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops" }, {"@echo Generating m6809 source file...", PYTHON .. " $(1) $(<) > $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6809/hd6309.ops" , GEN_DIR .. "emu/cpu/m6809/hd6309.hxx", { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py" , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops" }, {"@echo Generating hd6309 source file...", PYTHON .. " $(1) $(<) > $(@)" }},
+ { MAME_DIR .. "src/devices/cpu/m6809/konami.ops" , GEN_DIR .. "emu/cpu/m6809/konami.hxx", { MAME_DIR .. "src/devices/cpu/m6809/m6809make.py" , MAME_DIR .. "src/devices/cpu/m6809/base6x09.ops" }, {"@echo Generating konami source file...", PYTHON .. " $(1) $(<) > $(@)" }},
}
end
@@ -1362,7 +1362,7 @@ if (CPUS["MC68HC11"]~=null) then
MAME_DIR .. "src/devices/cpu/mc68hc11/mc68hc11.cpp",
MAME_DIR .. "src/devices/cpu/mc68hc11/mc68hc11.h",
MAME_DIR .. "src/devices/cpu/mc68hc11/hc11ops.h",
- MAME_DIR .. "src/devices/cpu/mc68hc11/hc11ops.inc",
+ MAME_DIR .. "src/devices/cpu/mc68hc11/hc11ops.hxx",
}
end
@@ -1382,7 +1382,7 @@ if (CPUS["M680X0"]~=null) then
MAME_DIR .. "src/devices/cpu/m68000/m68kops.cpp",
MAME_DIR .. "src/devices/cpu/m68000/m68kops.h",
MAME_DIR .. "src/devices/cpu/m68000/m68000.h",
- MAME_DIR .. "src/devices/cpu/m68000/m68kfpu.inc",
+ MAME_DIR .. "src/devices/cpu/m68000/m68kfpu.hxx",
--MAME_DIR .. "src/devices/cpu/m68000/m68kmake.cpp",
MAME_DIR .. "src/devices/cpu/m68000/m68kmmu.h",
--MAME_DIR .. "src/devices/cpu/m68000/m68k_in.cpp",
@@ -1407,7 +1407,7 @@ if (CPUS["DSP56156"]~=null) then
MAME_DIR .. "src/devices/cpu/dsp56k/dsp56pcu.cpp",
MAME_DIR .. "src/devices/cpu/dsp56k/dsp56pcu.h",
MAME_DIR .. "src/devices/cpu/dsp56k/dsp56def.h",
- MAME_DIR .. "src/devices/cpu/dsp56k/dsp56ops.inc",
+ MAME_DIR .. "src/devices/cpu/dsp56k/dsp56ops.hxx",
MAME_DIR .. "src/devices/cpu/dsp56k/inst.h",
MAME_DIR .. "src/devices/cpu/dsp56k/opcode.h",
MAME_DIR .. "src/devices/cpu/dsp56k/pmove.h",
@@ -1494,12 +1494,12 @@ if (CPUS["NEC"]~=null) then
MAME_DIR .. "src/devices/cpu/nec/nec.h",
MAME_DIR .. "src/devices/cpu/nec/necea.h",
MAME_DIR .. "src/devices/cpu/nec/necinstr.h",
- MAME_DIR .. "src/devices/cpu/nec/necinstr.inc",
+ MAME_DIR .. "src/devices/cpu/nec/necinstr.hxx",
MAME_DIR .. "src/devices/cpu/nec/necmacro.h",
MAME_DIR .. "src/devices/cpu/nec/necmodrm.h",
MAME_DIR .. "src/devices/cpu/nec/necpriv.h",
MAME_DIR .. "src/devices/cpu/nec/v25instr.h",
- MAME_DIR .. "src/devices/cpu/nec/v25instr.inc",
+ MAME_DIR .. "src/devices/cpu/nec/v25instr.hxx",
MAME_DIR .. "src/devices/cpu/nec/v25priv.h",
MAME_DIR .. "src/devices/cpu/nec/v25.cpp",
MAME_DIR .. "src/devices/cpu/nec/v25.h",
@@ -1533,18 +1533,18 @@ if (CPUS["V60"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/v60/v60.cpp",
MAME_DIR .. "src/devices/cpu/v60/v60.h",
- MAME_DIR .. "src/devices/cpu/v60/am.inc",
- MAME_DIR .. "src/devices/cpu/v60/am1.inc",
- MAME_DIR .. "src/devices/cpu/v60/am2.inc",
- MAME_DIR .. "src/devices/cpu/v60/am3.inc",
- MAME_DIR .. "src/devices/cpu/v60/op12.inc",
- MAME_DIR .. "src/devices/cpu/v60/op2.inc",
- MAME_DIR .. "src/devices/cpu/v60/op3.inc",
- MAME_DIR .. "src/devices/cpu/v60/op4.inc",
- MAME_DIR .. "src/devices/cpu/v60/op5.inc",
- MAME_DIR .. "src/devices/cpu/v60/op6.inc",
- MAME_DIR .. "src/devices/cpu/v60/op7a.inc",
- MAME_DIR .. "src/devices/cpu/v60/optable.inc",
+ MAME_DIR .. "src/devices/cpu/v60/am.hxx",
+ MAME_DIR .. "src/devices/cpu/v60/am1.hxx",
+ MAME_DIR .. "src/devices/cpu/v60/am2.hxx",
+ MAME_DIR .. "src/devices/cpu/v60/am3.hxx",
+ MAME_DIR .. "src/devices/cpu/v60/op12.hxx",
+ MAME_DIR .. "src/devices/cpu/v60/op2.hxx",
+ MAME_DIR .. "src/devices/cpu/v60/op3.hxx",
+ MAME_DIR .. "src/devices/cpu/v60/op4.hxx",
+ MAME_DIR .. "src/devices/cpu/v60/op5.hxx",
+ MAME_DIR .. "src/devices/cpu/v60/op6.hxx",
+ MAME_DIR .. "src/devices/cpu/v60/op7a.hxx",
+ MAME_DIR .. "src/devices/cpu/v60/optable.hxx",
}
end
@@ -1715,8 +1715,8 @@ if (CPUS["SATURN"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/saturn/saturn.cpp",
MAME_DIR .. "src/devices/cpu/saturn/saturn.h",
- MAME_DIR .. "src/devices/cpu/saturn/satops.inc",
- MAME_DIR .. "src/devices/cpu/saturn/sattable.inc",
+ MAME_DIR .. "src/devices/cpu/saturn/satops.hxx",
+ MAME_DIR .. "src/devices/cpu/saturn/sattable.hxx",
}
end
@@ -1793,8 +1793,8 @@ if (CPUS["SC61860"]~=null) then
MAME_DIR .. "src/devices/cpu/sc61860/sc61860.cpp",
MAME_DIR .. "src/devices/cpu/sc61860/sc61860.h",
--MAME_DIR .. "src/devices/cpu/sc61860/readpc.cpp",
- MAME_DIR .. "src/devices/cpu/sc61860/scops.inc",
- MAME_DIR .. "src/devices/cpu/sc61860/sctable.inc",
+ MAME_DIR .. "src/devices/cpu/sc61860/scops.hxx",
+ MAME_DIR .. "src/devices/cpu/sc61860/sctable.hxx",
}
end
@@ -1912,7 +1912,7 @@ if (CPUS["TMS7000"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/tms7000/tms7000.cpp",
MAME_DIR .. "src/devices/cpu/tms7000/tms7000.h",
- MAME_DIR .. "src/devices/cpu/tms7000/tms70op.inc",
+ MAME_DIR .. "src/devices/cpu/tms7000/tms70op.hxx",
}
end
@@ -1955,11 +1955,11 @@ if (CPUS["TMS340X0"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/tms34010/tms34010.cpp",
MAME_DIR .. "src/devices/cpu/tms34010/tms34010.h",
- MAME_DIR .. "src/devices/cpu/tms34010/34010fld.inc",
- MAME_DIR .. "src/devices/cpu/tms34010/34010gfx.inc",
+ MAME_DIR .. "src/devices/cpu/tms34010/34010fld.hxx",
+ MAME_DIR .. "src/devices/cpu/tms34010/34010gfx.hxx",
MAME_DIR .. "src/devices/cpu/tms34010/34010ops.h",
- MAME_DIR .. "src/devices/cpu/tms34010/34010ops.inc",
- MAME_DIR .. "src/devices/cpu/tms34010/34010tbl.inc",
+ MAME_DIR .. "src/devices/cpu/tms34010/34010ops.hxx",
+ MAME_DIR .. "src/devices/cpu/tms34010/34010tbl.hxx",
--MAME_DIR .. "src/devices/cpu/tms34010/dis34010.cpp",
}
end
@@ -2011,7 +2011,7 @@ if (CPUS["TMS32031"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/tms32031/tms32031.cpp",
MAME_DIR .. "src/devices/cpu/tms32031/tms32031.h",
- MAME_DIR .. "src/devices/cpu/tms32031/32031ops.inc",
+ MAME_DIR .. "src/devices/cpu/tms32031/32031ops.hxx",
}
end
@@ -2029,7 +2029,7 @@ if (CPUS["TMS32051"]~=null) then
MAME_DIR .. "src/devices/cpu/tms32051/tms32051.cpp",
MAME_DIR .. "src/devices/cpu/tms32051/tms32051.h",
MAME_DIR .. "src/devices/cpu/tms32051/32051ops.h",
- MAME_DIR .. "src/devices/cpu/tms32051/32051ops.inc",
+ MAME_DIR .. "src/devices/cpu/tms32051/32051ops.hxx",
}
end
@@ -2067,18 +2067,18 @@ if (CPUS["TMS57002"]~=null) then
MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp",
}
dependency {
- { MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" },
- { MAME_DIR .. "src/devices/cpu/tms57002/tms57002.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" },
+ { MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx" },
+ { MAME_DIR .. "src/devices/cpu/tms57002/tms57002.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx" },
}
custombuildtask {
- { MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc", { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" } }
+ { MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx", { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" } }
}
end
if (CPUS["TMS57002"]~=null or _OPTIONS["with-tools"]) then
table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms57002/57002dsm.cpp")
- table.insert(disasm_dependency , { MAME_DIR .. "src/devices/cpu/tms57002/57002dsm.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" } )
- table.insert(disasm_custombuildtask , { MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc", { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" }})
+ table.insert(disasm_dependency , { MAME_DIR .. "src/devices/cpu/tms57002/57002dsm.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx" } )
+ table.insert(disasm_custombuildtask , { MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.hxx", { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" }})
end
--------------------------------------------------
@@ -2102,7 +2102,7 @@ if (CPUS["TLCS900"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/tlcs900/tlcs900.cpp",
MAME_DIR .. "src/devices/cpu/tlcs900/tlcs900.h",
- MAME_DIR .. "src/devices/cpu/tlcs900/900tbl.inc",
+ MAME_DIR .. "src/devices/cpu/tlcs900/900tbl.hxx",
}
end
@@ -2144,8 +2144,8 @@ if (CPUS["LR35902"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/lr35902/lr35902.cpp",
MAME_DIR .. "src/devices/cpu/lr35902/lr35902.h",
- MAME_DIR .. "src/devices/cpu/lr35902/opc_cb.inc",
- MAME_DIR .. "src/devices/cpu/lr35902/opc_main.inc",
+ MAME_DIR .. "src/devices/cpu/lr35902/opc_cb.hxx",
+ MAME_DIR .. "src/devices/cpu/lr35902/opc_main.hxx",
}
end
@@ -2162,14 +2162,14 @@ if (CPUS["Z180"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/z180/z180.cpp",
MAME_DIR .. "src/devices/cpu/z180/z180.h",
- MAME_DIR .. "src/devices/cpu/z180/z180cb.inc",
- MAME_DIR .. "src/devices/cpu/z180/z180dd.inc",
- MAME_DIR .. "src/devices/cpu/z180/z180ed.inc",
- MAME_DIR .. "src/devices/cpu/z180/z180fd.inc",
- MAME_DIR .. "src/devices/cpu/z180/z180op.inc",
+ MAME_DIR .. "src/devices/cpu/z180/z180cb.hxx",
+ MAME_DIR .. "src/devices/cpu/z180/z180dd.hxx",
+ MAME_DIR .. "src/devices/cpu/z180/z180ed.hxx",
+ MAME_DIR .. "src/devices/cpu/z180/z180fd.hxx",
+ MAME_DIR .. "src/devices/cpu/z180/z180op.hxx",
MAME_DIR .. "src/devices/cpu/z180/z180ops.h",
MAME_DIR .. "src/devices/cpu/z180/z180tbl.h",
- MAME_DIR .. "src/devices/cpu/z180/z180xy.inc",
+ MAME_DIR .. "src/devices/cpu/z180/z180xy.hxx",
MAME_DIR .. "src/devices/cpu/z80/z80daisy.cpp",
MAME_DIR .. "src/devices/cpu/z80/z80daisy.h",
}
@@ -2191,8 +2191,8 @@ if (CPUS["Z8000"]~=null) then
--MAME_DIR .. "src/devices/cpu/z8000/makedab.cpp",
MAME_DIR .. "src/devices/cpu/z8000/z8000cpu.h",
MAME_DIR .. "src/devices/cpu/z8000/z8000dab.h",
- MAME_DIR .. "src/devices/cpu/z8000/z8000ops.inc",
- MAME_DIR .. "src/devices/cpu/z8000/z8000tbl.inc",
+ MAME_DIR .. "src/devices/cpu/z8000/z8000ops.hxx",
+ MAME_DIR .. "src/devices/cpu/z8000/z8000tbl.hxx",
}
end
@@ -2209,7 +2209,7 @@ if (CPUS["Z8"]~=null) then
files {
MAME_DIR .. "src/devices/cpu/z8/z8.cpp",
MAME_DIR .. "src/devices/cpu/z8/z8.h",
- MAME_DIR .. "src/devices/cpu/z8/z8ops.inc",
+ MAME_DIR .. "src/devices/cpu/z8/z8ops.hxx",
}
end
diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua
index b8b98cc2da0..2449faa0ae5 100644
--- a/scripts/src/emu.lua
+++ b/scripts/src/emu.lua
@@ -172,7 +172,7 @@ files {
MAME_DIR .. "src/emu/validity.h",
MAME_DIR .. "src/emu/video.cpp",
MAME_DIR .. "src/emu/video.h",
- MAME_DIR .. "src/emu/rendersw.inc",
+ MAME_DIR .. "src/emu/rendersw.hxx",
MAME_DIR .. "src/emu/ui/uimain.h",
MAME_DIR .. "src/emu/ui/cmdrender.h", -- TODO: remove
MAME_DIR .. "src/emu/ui/cmddata.h", -- TODO: remove
diff --git a/scripts/src/machine.lua b/scripts/src/machine.lua
index 72bde3ab5ce..42a51a6c1e4 100644
--- a/scripts/src/machine.lua
+++ b/scripts/src/machine.lua
@@ -1988,7 +1988,7 @@ if (MACHINES["S3C2400"]~=null) then
files {
MAME_DIR .. "src/devices/machine/s3c2400.cpp",
MAME_DIR .. "src/devices/machine/s3c2400.h",
- MAME_DIR .. "src/devices/machine/s3c24xx.inc",
+ MAME_DIR .. "src/devices/machine/s3c24xx.hxx",
}
end
@@ -2001,7 +2001,7 @@ if (MACHINES["S3C2410"]~=null) then
files {
MAME_DIR .. "src/devices/machine/s3c2410.cpp",
MAME_DIR .. "src/devices/machine/s3c2410.h",
- MAME_DIR .. "src/devices/machine/s3c24xx.inc",
+ MAME_DIR .. "src/devices/machine/s3c24xx.hxx",
}
end
@@ -2026,7 +2026,7 @@ if (MACHINES["S3C2440"]~=null) then
files {
MAME_DIR .. "src/devices/machine/s3c2440.cpp",
MAME_DIR .. "src/devices/machine/s3c2440.h",
- MAME_DIR .. "src/devices/machine/s3c24xx.inc",
+ MAME_DIR .. "src/devices/machine/s3c24xx.hxx",
}
end
diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua
index 8039109941a..2c54bf7f0f6 100644
--- a/scripts/src/sound.lua
+++ b/scripts/src/sound.lua
@@ -81,15 +81,15 @@ if (SOUNDS["DISCRETE"]~=null) then
MAME_DIR .. "src/devices/sound/discrete.h",
MAME_DIR .. "src/devices/sound/disc_cls.h",
MAME_DIR .. "src/devices/sound/disc_dev.h",
- MAME_DIR .. "src/devices/sound/disc_dev.inc",
+ MAME_DIR .. "src/devices/sound/disc_dev.hxx",
MAME_DIR .. "src/devices/sound/disc_flt.h",
- MAME_DIR .. "src/devices/sound/disc_flt.inc",
- MAME_DIR .. "src/devices/sound/disc_inp.inc",
+ MAME_DIR .. "src/devices/sound/disc_flt.hxx",
+ MAME_DIR .. "src/devices/sound/disc_inp.hxx",
MAME_DIR .. "src/devices/sound/disc_mth.h",
- MAME_DIR .. "src/devices/sound/disc_mth.inc",
- MAME_DIR .. "src/devices/sound/disc_sys.inc",
+ MAME_DIR .. "src/devices/sound/disc_mth.hxx",
+ MAME_DIR .. "src/devices/sound/disc_sys.hxx",
MAME_DIR .. "src/devices/sound/disc_wav.h",
- MAME_DIR .. "src/devices/sound/disc_wav.inc",
+ MAME_DIR .. "src/devices/sound/disc_wav.hxx",
}
end
@@ -1014,7 +1014,7 @@ if (SOUNDS["TMS5110"]~=null) then
files {
MAME_DIR .. "src/devices/sound/tms5110.cpp",
MAME_DIR .. "src/devices/sound/tms5110.h",
- MAME_DIR .. "src/devices/sound/tms5110r.inc",
+ MAME_DIR .. "src/devices/sound/tms5110r.hxx",
}
end
@@ -1026,7 +1026,7 @@ if (SOUNDS["TMS5220"]~=null) then
files {
MAME_DIR .. "src/devices/sound/tms5220.cpp",
MAME_DIR .. "src/devices/sound/tms5220.h",
- MAME_DIR .. "src/devices/sound/tms5110r.inc",
+ MAME_DIR .. "src/devices/sound/tms5110r.hxx",
MAME_DIR .. "src/devices/machine/spchrom.cpp",
MAME_DIR .. "src/devices/machine/spchrom.h",
}
@@ -1082,7 +1082,7 @@ if (SOUNDS["VLM5030"]~=null) then
files {
MAME_DIR .. "src/devices/sound/vlm5030.cpp",
MAME_DIR .. "src/devices/sound/vlm5030.h",
- MAME_DIR .. "src/devices/sound/tms5110r.inc",
+ MAME_DIR .. "src/devices/sound/tms5110r.hxx",
}
end
diff --git a/scripts/src/video.lua b/scripts/src/video.lua
index a8993df052b..587c36f2713 100644
--- a/scripts/src/video.lua
+++ b/scripts/src/video.lua
@@ -203,8 +203,8 @@ if (VIDEOS["EPIC12"]~=null) then
MAME_DIR .. "src/devices/video/epic12_blit6.cpp",
MAME_DIR .. "src/devices/video/epic12_blit7.cpp",
MAME_DIR .. "src/devices/video/epic12_blit8.cpp",
- MAME_DIR .. "src/devices/video/epic12in.inc",
- MAME_DIR .. "src/devices/video/epic12pixel.inc",
+ MAME_DIR .. "src/devices/video/epic12in.hxx",
+ MAME_DIR .. "src/devices/video/epic12pixel.hxx",
}
end
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index edd8458fd87..50300af2f7d 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -1027,8 +1027,8 @@ files {
MAME_DIR .. "src/mame/audio/jaguar.cpp",
MAME_DIR .. "src/mame/video/jaguar.cpp",
MAME_DIR .. "src/mame/video/jagblit.h",
- MAME_DIR .. "src/mame/video/jagblit.inc",
- MAME_DIR .. "src/mame/video/jagobj.inc",
+ MAME_DIR .. "src/mame/video/jagblit.hxx",
+ MAME_DIR .. "src/mame/video/jagobj.hxx",
MAME_DIR .. "src/mame/drivers/jedi.cpp",
MAME_DIR .. "src/mame/includes/jedi.h",
MAME_DIR .. "src/mame/audio/jedi.cpp",
@@ -1200,24 +1200,24 @@ files {
MAME_DIR .. "src/mame/drivers/mpu2.cpp",
MAME_DIR .. "src/mame/drivers/mpu3.cpp",
MAME_DIR .. "src/mame/drivers/mpu4.cpp",
- MAME_DIR .. "src/mame/drivers/mpu4sw.inc",
- MAME_DIR .. "src/mame/drivers/mpu4.inc",
+ MAME_DIR .. "src/mame/drivers/mpu4sw.hxx",
+ MAME_DIR .. "src/mame/drivers/mpu4.hxx",
MAME_DIR .. "src/mame/includes/mpu4.h",
- MAME_DIR .. "src/mame/drivers/mpu4mod2sw.inc",
- MAME_DIR .. "src/mame/drivers/mpu4mod4yam.inc",
+ MAME_DIR .. "src/mame/drivers/mpu4mod2sw.hxx",
+ MAME_DIR .. "src/mame/drivers/mpu4mod4yam.hxx",
MAME_DIR .. "src/mame/drivers/mpu4plasma.cpp",
MAME_DIR .. "src/mame/drivers/mpu4dealem.cpp",
MAME_DIR .. "src/mame/drivers/mpu4vid.cpp",
- MAME_DIR .. "src/mame/drivers/mpu4avan.inc",
- MAME_DIR .. "src/mame/drivers/mpu4union.inc",
- MAME_DIR .. "src/mame/drivers/mpu4concept.inc",
- MAME_DIR .. "src/mame/drivers/mpu4empire.inc",
- MAME_DIR .. "src/mame/drivers/mpu4mdm.inc",
- MAME_DIR .. "src/mame/drivers/mpu4crystal.inc",
- MAME_DIR .. "src/mame/drivers/mpu4bwb.inc",
- MAME_DIR .. "src/mame/drivers/mpu4misc.inc",
+ MAME_DIR .. "src/mame/drivers/mpu4avan.hxx",
+ MAME_DIR .. "src/mame/drivers/mpu4union.hxx",
+ MAME_DIR .. "src/mame/drivers/mpu4concept.hxx",
+ MAME_DIR .. "src/mame/drivers/mpu4empire.hxx",
+ MAME_DIR .. "src/mame/drivers/mpu4mdm.hxx",
+ MAME_DIR .. "src/mame/drivers/mpu4crystal.hxx",
+ MAME_DIR .. "src/mame/drivers/mpu4bwb.hxx",
+ MAME_DIR .. "src/mame/drivers/mpu4misc.hxx",
MAME_DIR .. "src/mame/drivers/mpu5.cpp",
- MAME_DIR .. "src/mame/drivers/mpu5.inc",
+ MAME_DIR .. "src/mame/drivers/mpu5.hxx",
MAME_DIR .. "src/mame/video/awpvid.cpp",
MAME_DIR .. "src/mame/video/awpvid.h",
MAME_DIR .. "src/mame/machine/meters.cpp",
@@ -1236,10 +1236,10 @@ files {
MAME_DIR .. "src/mame/drivers/bfm_sc4.cpp",
MAME_DIR .. "src/mame/drivers/bfm_sc5.cpp",
MAME_DIR .. "src/mame/includes/bfm_sc5.h",
- MAME_DIR .. "src/mame/drivers/bfm_sc5.inc",
+ MAME_DIR .. "src/mame/drivers/bfm_sc5.hxx",
MAME_DIR .. "src/mame/drivers/bfm_ad5.cpp",
MAME_DIR .. "src/mame/includes/bfm_ad5.h",
- MAME_DIR .. "src/mame/drivers/bfm_ad5.inc",
+ MAME_DIR .. "src/mame/drivers/bfm_ad5.hxx",
MAME_DIR .. "src/mame/machine/bfm_sc45_helper.cpp",
MAME_DIR .. "src/mame/machine/bfm_sc45_helper.h",
MAME_DIR .. "src/mame/includes/bfm_sc45.h",
@@ -2384,7 +2384,7 @@ createMAMEProjects(_target, _subtarget, "maygay")
files {
MAME_DIR .. "src/mame/drivers/maygay1b.cpp",
MAME_DIR .. "src/mame/includes/maygay1b.h",
- MAME_DIR .. "src/mame/drivers/maygay1b.inc",
+ MAME_DIR .. "src/mame/drivers/maygay1b.hxx",
MAME_DIR .. "src/mame/drivers/maygayv1.cpp",
MAME_DIR .. "src/mame/drivers/maygayep.cpp",
MAME_DIR .. "src/mame/drivers/maygaysw.cpp",
@@ -2676,7 +2676,7 @@ createMAMEProjects(_target, _subtarget, "neogeo")
files {
MAME_DIR .. "src/mame/drivers/neogeo.cpp",
MAME_DIR .. "src/mame/includes/neogeo.h",
- MAME_DIR .. "src/mame/drivers/neodriv.inc",
+ MAME_DIR .. "src/mame/drivers/neodriv.hxx",
MAME_DIR .. "src/mame/video/neogeo.cpp",
MAME_DIR .. "src/mame/drivers/neopcb.cpp",
MAME_DIR .. "src/mame/video/neogeo_spr.cpp",
@@ -3049,7 +3049,7 @@ files {
MAME_DIR .. "src/mame/audio/dsbz80.h",
MAME_DIR .. "src/mame/drivers/model2.cpp",
MAME_DIR .. "src/mame/includes/model2.h",
- MAME_DIR .. "src/mame/video/model2rd.inc",
+ MAME_DIR .. "src/mame/video/model2rd.hxx",
MAME_DIR .. "src/mame/video/model2.cpp",
MAME_DIR .. "src/mame/drivers/model3.cpp",
MAME_DIR .. "src/mame/includes/model3.h",
@@ -3297,7 +3297,7 @@ files {
MAME_DIR .. "src/mame/machine/n64.cpp",
MAME_DIR .. "src/mame/video/n64.cpp",
MAME_DIR .. "src/mame/video/n64types.h",
- MAME_DIR .. "src/mame/video/rdpfiltr.inc",
+ MAME_DIR .. "src/mame/video/rdpfiltr.hxx",
MAME_DIR .. "src/mame/video/n64.h",
MAME_DIR .. "src/mame/video/rdpblend.cpp",
MAME_DIR .. "src/mame/video/rdpblend.h",
@@ -3361,8 +3361,8 @@ files {
MAME_DIR .. "src/mame/audio/hng64.cpp",
MAME_DIR .. "src/mame/machine/hng64_net.cpp",
MAME_DIR .. "src/mame/machine/hng64_net.h",
- MAME_DIR .. "src/mame/video/hng64_3d.inc",
- MAME_DIR .. "src/mame/video/hng64_sprite.inc",
+ MAME_DIR .. "src/mame/video/hng64_3d.hxx",
+ MAME_DIR .. "src/mame/video/hng64_sprite.hxx",
MAME_DIR .. "src/mame/drivers/lasso.cpp",
MAME_DIR .. "src/mame/includes/lasso.h",
MAME_DIR .. "src/mame/video/lasso.cpp",
@@ -4474,7 +4474,7 @@ files {
MAME_DIR .. "src/mame/drivers/multfish.cpp",
MAME_DIR .. "src/mame/includes/multfish.h",
MAME_DIR .. "src/mame/drivers/multfish_boot.cpp",
- MAME_DIR .. "src/mame/drivers/multfish_ref.inc",
+ MAME_DIR .. "src/mame/drivers/multfish_ref.hxx",
MAME_DIR .. "src/mame/drivers/murogem.cpp",
MAME_DIR .. "src/mame/drivers/murogmbl.cpp",
MAME_DIR .. "src/mame/drivers/neoprint.cpp",
@@ -4588,7 +4588,7 @@ files {
MAME_DIR .. "src/mame/drivers/ice_bozopail.cpp",
MAME_DIR .. "src/mame/drivers/ice_tbd.cpp",
MAME_DIR .. "src/mame/drivers/umipoker.cpp",
- MAME_DIR .. "src/mame/drivers/unkfr.inc",
+ MAME_DIR .. "src/mame/drivers/unkfr.hxx",
MAME_DIR .. "src/mame/drivers/unkhorse.cpp",
MAME_DIR .. "src/mame/drivers/usgames.cpp",
MAME_DIR .. "src/mame/includes/usgames.h",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index a756f522286..5b3ec38269d 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -974,8 +974,8 @@ files {
MAME_DIR .. "src/mame/audio/jaguar.cpp",
MAME_DIR .. "src/mame/video/jaguar.cpp",
MAME_DIR .. "src/mame/video/jagblit.h",
- MAME_DIR .. "src/mame/video/jagblit.inc",
- MAME_DIR .. "src/mame/video/jagobj.inc",
+ MAME_DIR .. "src/mame/video/jagblit.hxx",
+ MAME_DIR .. "src/mame/video/jagobj.hxx",
MAME_DIR .. "src/mame/audio/gorf.cpp",
MAME_DIR .. "src/mame/audio/wow.cpp",
MAME_DIR .. "src/mame/drivers/astrocde.cpp",
@@ -992,7 +992,7 @@ files {
MAME_DIR .. "src/mame/machine/n64.cpp",
MAME_DIR .. "src/mame/video/n64.cpp",
MAME_DIR .. "src/mame/video/n64types.h",
- MAME_DIR .. "src/mame/video/rdpfiltr.inc",
+ MAME_DIR .. "src/mame/video/rdpfiltr.hxx",
MAME_DIR .. "src/mame/video/n64.h",
MAME_DIR .. "src/mame/video/rdpblend.cpp",
MAME_DIR .. "src/mame/video/rdpblend.h",
@@ -2157,10 +2157,10 @@ files {
MAME_DIR .. "src/mame/includes/snes.h",
MAME_DIR .. "src/mame/machine/snescx4.cpp",
MAME_DIR .. "src/mame/machine/snescx4.h",
- MAME_DIR .. "src/mame/machine/cx4data.inc",
- MAME_DIR .. "src/mame/machine/cx4fn.inc",
- MAME_DIR .. "src/mame/machine/cx4oam.inc",
- MAME_DIR .. "src/mame/machine/cx4ops.inc",
+ MAME_DIR .. "src/mame/machine/cx4data.hxx",
+ MAME_DIR .. "src/mame/machine/cx4fn.hxx",
+ MAME_DIR .. "src/mame/machine/cx4oam.hxx",
+ MAME_DIR .. "src/mame/machine/cx4ops.hxx",
MAME_DIR .. "src/mame/drivers/vboy.cpp",
MAME_DIR .. "src/mame/audio/vboy.cpp",
MAME_DIR .. "src/mame/audio/vboy.h",
@@ -2251,7 +2251,7 @@ files {
createMESSProjects(_target, _subtarget, "palm")
files {
MAME_DIR .. "src/mame/drivers/palm.cpp",
- MAME_DIR .. "src/mame/drivers/palm_dbg.inc",
+ MAME_DIR .. "src/mame/drivers/palm_dbg.hxx",
MAME_DIR .. "src/mame/drivers/palmz22.cpp",
}
diff --git a/src/devices/bus/nes/nes_ines.inc b/src/devices/bus/nes/nes_ines.hxx
index a3bf0ad803e..a3bf0ad803e 100644
--- a/src/devices/bus/nes/nes_ines.inc
+++ b/src/devices/bus/nes/nes_ines.hxx
diff --git a/src/devices/bus/nes/nes_pcb.inc b/src/devices/bus/nes/nes_pcb.hxx
index b7af5aeefd4..b7af5aeefd4 100644
--- a/src/devices/bus/nes/nes_pcb.inc
+++ b/src/devices/bus/nes/nes_pcb.hxx
diff --git a/src/devices/bus/nes/nes_slot.cpp b/src/devices/bus/nes/nes_slot.cpp
index 5eaf22852c9..1bcf8d6de6e 100644
--- a/src/devices/bus/nes/nes_slot.cpp
+++ b/src/devices/bus/nes/nes_slot.cpp
@@ -806,7 +806,7 @@ void nes_cart_slot_device::pcb_reset()
-------------------------------------------------*/
/* Include emulation of NES PCBs for softlist */
-#include "nes_pcb.inc"
+#include "nes_pcb.hxx"
/*-------------------------------------------------
@@ -816,7 +816,7 @@ void nes_cart_slot_device::pcb_reset()
-------------------------------------------------*/
/* Include emulation of UNIF Boards for .unf files */
-#include "nes_unif.inc"
+#include "nes_unif.hxx"
/*-------------------------------------------------
@@ -826,7 +826,7 @@ void nes_cart_slot_device::pcb_reset()
-------------------------------------------------*/
/* Include emulation of iNES Mappers for .nes files */
-#include "nes_ines.inc"
+#include "nes_ines.hxx"
bool nes_cart_slot_device::call_load()
diff --git a/src/devices/bus/nes/nes_unif.inc b/src/devices/bus/nes/nes_unif.hxx
index 890685bfe76..890685bfe76 100644
--- a/src/devices/bus/nes/nes_unif.inc
+++ b/src/devices/bus/nes/nes_unif.hxx
diff --git a/src/devices/cpu/adsp2100/2100ops.inc b/src/devices/cpu/adsp2100/2100ops.hxx
index 31cae1ae59b..31cae1ae59b 100644
--- a/src/devices/cpu/adsp2100/2100ops.inc
+++ b/src/devices/cpu/adsp2100/2100ops.hxx
diff --git a/src/devices/cpu/adsp2100/adsp2100.cpp b/src/devices/cpu/adsp2100/adsp2100.cpp
index 3f169ae0ee5..868303fde40 100644
--- a/src/devices/cpu/adsp2100/adsp2100.cpp
+++ b/src/devices/cpu/adsp2100/adsp2100.cpp
@@ -818,7 +818,7 @@ inline UINT32 adsp21xx_device::opcode_read()
IMPORT CORE UTILITIES
***************************************************************************/
-#include "2100ops.inc"
+#include "2100ops.hxx"
diff --git a/src/devices/cpu/arcompact/arcompact_execute.cpp b/src/devices/cpu/arcompact/arcompact_execute.cpp
index 8da820fa25d..d145a698fc8 100644
--- a/src/devices/cpu/arcompact/arcompact_execute.cpp
+++ b/src/devices/cpu/arcompact/arcompact_execute.cpp
@@ -1840,7 +1840,7 @@ ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_helper(OPS_32, const char
}
-#include "cpu/arcompact/arcompact.inc"
+#include "cpu/arcompact/arcompact.hxx"
ARCOMPACT_RETTYPE arcompact_device::arcompact_handle04_01(OPS_32)
{
diff --git a/src/devices/cpu/arm7/arm7.cpp b/src/devices/cpu/arm7/arm7.cpp
index f10537dfd16..50388580e5a 100644
--- a/src/devices/cpu/arm7/arm7.cpp
+++ b/src/devices/cpu/arm7/arm7.cpp
@@ -483,7 +483,7 @@ bool arm7_cpu_device::memory_translate(address_spacenum spacenum, int intention,
/* include the arm7 core */
-#include "arm7core.inc"
+#include "arm7core.hxx"
/***************************************************************************
* CPU SPECIFIC IMPLEMENTATIONS
@@ -1211,4 +1211,4 @@ UINT8 arm7_cpu_device::arm7_cpu_read8(UINT32 addr)
return m_program->read_byte(addr);
}
-#include "arm7drc.inc"
+#include "arm7drc.hxx"
diff --git a/src/devices/cpu/arm7/arm7core.inc b/src/devices/cpu/arm7/arm7core.hxx
index 736d42b0262..736d42b0262 100644
--- a/src/devices/cpu/arm7/arm7core.inc
+++ b/src/devices/cpu/arm7/arm7core.hxx
diff --git a/src/devices/cpu/arm7/arm7drc.inc b/src/devices/cpu/arm7/arm7drc.hxx
index 54ef46aa0fa..c588234eb5b 100644
--- a/src/devices/cpu/arm7/arm7drc.inc
+++ b/src/devices/cpu/arm7/arm7drc.hxx
@@ -37,7 +37,7 @@
CONSTANTS
***************************************************************************/
-#include "arm7tdrc.inc"
+#include "arm7tdrc.hxx"
/* map variables */
#define MAPVAR_PC uml::M0
diff --git a/src/devices/cpu/arm7/arm7tdrc.inc b/src/devices/cpu/arm7/arm7tdrc.hxx
index ee0573a32e7..ee0573a32e7 100644
--- a/src/devices/cpu/arm7/arm7tdrc.inc
+++ b/src/devices/cpu/arm7/arm7tdrc.hxx
diff --git a/src/devices/cpu/cop400/cop400.cpp b/src/devices/cpu/cop400/cop400.cpp
index bad120eeb03..41d2974fb65 100644
--- a/src/devices/cpu/cop400/cop400.cpp
+++ b/src/devices/cpu/cop400/cop400.cpp
@@ -351,7 +351,7 @@ INSTRUCTION(illegal)
logerror("COP400: PC = %04x, Illegal opcode = %02x\n", PC-1, ROM(PC-1));
}
-#include "cop400op.inc"
+#include "cop400op.hxx"
/***************************************************************************
OPCODE TABLES
diff --git a/src/devices/cpu/cop400/cop400op.inc b/src/devices/cpu/cop400/cop400op.hxx
index 1f1bf1bfade..1f1bf1bfade 100644
--- a/src/devices/cpu/cop400/cop400op.inc
+++ b/src/devices/cpu/cop400/cop400op.hxx
diff --git a/src/devices/cpu/dsp16/dsp16.cpp b/src/devices/cpu/dsp16/dsp16.cpp
index ac27d657fa1..70155100bfe 100644
--- a/src/devices/cpu/dsp16/dsp16.cpp
+++ b/src/devices/cpu/dsp16/dsp16.cpp
@@ -450,4 +450,4 @@ void dsp16_device::execute_run()
} while (m_icount > 0);
}
-#include "dsp16ops.inc"
+#include "dsp16ops.hxx"
diff --git a/src/devices/cpu/dsp16/dsp16ops.inc b/src/devices/cpu/dsp16/dsp16ops.hxx
index 23d8797e64d..23d8797e64d 100644
--- a/src/devices/cpu/dsp16/dsp16ops.inc
+++ b/src/devices/cpu/dsp16/dsp16ops.hxx
diff --git a/src/devices/cpu/dsp32/dsp32.cpp b/src/devices/cpu/dsp32/dsp32.cpp
index f9a3907c8d0..dd6c2b17184 100644
--- a/src/devices/cpu/dsp32/dsp32.cpp
+++ b/src/devices/cpu/dsp32/dsp32.cpp
@@ -550,7 +550,7 @@ void dsp32c_device::update_pins(void)
// CORE INCLUDE
//**************************************************************************
-#include "dsp32ops.inc"
+#include "dsp32ops.hxx"
diff --git a/src/devices/cpu/dsp32/dsp32ops.inc b/src/devices/cpu/dsp32/dsp32ops.hxx
index 09844f6ee4f..09844f6ee4f 100644
--- a/src/devices/cpu/dsp32/dsp32ops.inc
+++ b/src/devices/cpu/dsp32/dsp32ops.hxx
diff --git a/src/devices/cpu/dsp56k/dsp56k.cpp b/src/devices/cpu/dsp56k/dsp56k.cpp
index d3cf3804fa8..39a19d73bd9 100644
--- a/src/devices/cpu/dsp56k/dsp56k.cpp
+++ b/src/devices/cpu/dsp56k/dsp56k.cpp
@@ -440,7 +440,7 @@ void dsp56k_device::device_reset()
/***************************************************************************
CORE INCLUDE
***************************************************************************/
-#include "dsp56ops.inc"
+#include "dsp56ops.hxx"
/***************************************************************************
diff --git a/src/devices/cpu/dsp56k/dsp56ops.inc b/src/devices/cpu/dsp56k/dsp56ops.hxx
index 27cbbd315fa..27cbbd315fa 100644
--- a/src/devices/cpu/dsp56k/dsp56ops.inc
+++ b/src/devices/cpu/dsp56k/dsp56ops.hxx
diff --git a/src/devices/cpu/e0c6200/e0c6200.cpp b/src/devices/cpu/e0c6200/e0c6200.cpp
index 780f4e77a04..c61250f068c 100644
--- a/src/devices/cpu/e0c6200/e0c6200.cpp
+++ b/src/devices/cpu/e0c6200/e0c6200.cpp
@@ -21,7 +21,7 @@
#include "e0c6200.h"
#include "debugger.h"
-#include "e0c6200op.inc"
+#include "e0c6200op.hxx"
// disasm
diff --git a/src/devices/cpu/e0c6200/e0c6200op.inc b/src/devices/cpu/e0c6200/e0c6200op.hxx
index 09fc07b3c70..09fc07b3c70 100644
--- a/src/devices/cpu/e0c6200/e0c6200op.inc
+++ b/src/devices/cpu/e0c6200/e0c6200op.hxx
diff --git a/src/devices/cpu/e132xs/e132xs.cpp b/src/devices/cpu/e132xs/e132xs.cpp
index 66567e35c2f..be3ea79d7eb 100644
--- a/src/devices/cpu/e132xs/e132xs.cpp
+++ b/src/devices/cpu/e132xs/e132xs.cpp
@@ -4871,7 +4871,7 @@ void hyperstone_device::hyperstone_trap(struct hyperstone_device::regs_decode *d
}
-#include "e132xsop.inc"
+#include "e132xsop.hxx"
//**************************************************************************
// CORE EXECUTION LOOP
diff --git a/src/devices/cpu/e132xs/e132xsop.inc b/src/devices/cpu/e132xs/e132xsop.hxx
index e37ef914246..e37ef914246 100644
--- a/src/devices/cpu/e132xs/e132xsop.inc
+++ b/src/devices/cpu/e132xs/e132xsop.hxx
diff --git a/src/devices/cpu/h8/h8.cpp b/src/devices/cpu/h8/h8.cpp
index efaac3c3380..a92143e5680 100644
--- a/src/devices/cpu/h8/h8.cpp
+++ b/src/devices/cpu/h8/h8.cpp
@@ -1592,4 +1592,4 @@ void h8_device::set_nz32(UINT32 v)
CCR |= F_N;
}
-#include "cpu/h8/h8.inc"
+#include "cpu/h8/h8.hxx"
diff --git a/src/devices/cpu/h8/h8h.cpp b/src/devices/cpu/h8/h8h.cpp
index 89615fadad5..a7ca2bc8685 100644
--- a/src/devices/cpu/h8/h8h.cpp
+++ b/src/devices/cpu/h8/h8h.cpp
@@ -15,4 +15,4 @@ offs_t h8h_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *opro
return disassemble_generic(buffer, pc, oprom, opram, options, disasm_entries);
}
-#include "cpu/h8/h8h.inc"
+#include "cpu/h8/h8h.hxx"
diff --git a/src/devices/cpu/h8/h8s2000.cpp b/src/devices/cpu/h8/h8s2000.cpp
index 4686e718666..7ebb24fd181 100644
--- a/src/devices/cpu/h8/h8s2000.cpp
+++ b/src/devices/cpu/h8/h8s2000.cpp
@@ -14,4 +14,4 @@ offs_t h8s2000_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *
return disassemble_generic(buffer, pc, oprom, opram, options, disasm_entries);
}
-#include "cpu/h8/h8s2000.inc"
+#include "cpu/h8/h8s2000.hxx"
diff --git a/src/devices/cpu/h8/h8s2600.cpp b/src/devices/cpu/h8/h8s2600.cpp
index a72cf591a19..d0b6edfeef2 100644
--- a/src/devices/cpu/h8/h8s2600.cpp
+++ b/src/devices/cpu/h8/h8s2600.cpp
@@ -13,4 +13,4 @@ offs_t h8s2600_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *
return disassemble_generic(buffer, pc, oprom, opram, options, disasm_entries);
}
-#include "cpu/h8/h8s2600.inc"
+#include "cpu/h8/h8s2600.hxx"
diff --git a/src/devices/cpu/i386/i386.cpp b/src/devices/cpu/i386/i386.cpp
index 454f9004d61..b46feb0f813 100644
--- a/src/devices/cpu/i386/i386.cpp
+++ b/src/devices/cpu/i386/i386.cpp
@@ -2879,12 +2879,12 @@ void i386_device::report_invalid_modrm(const char* opcode, UINT8 modrm)
}
-#include "i386ops.inc"
-#include "i386op16.inc"
-#include "i386op32.inc"
-#include "i486ops.inc"
-#include "pentops.inc"
-#include "x87ops.inc"
+#include "i386ops.hxx"
+#include "i386op16.hxx"
+#include "i386op32.hxx"
+#include "i486ops.hxx"
+#include "pentops.hxx"
+#include "x87ops.hxx"
#include "i386ops.h"
void i386_device::i386_decode_opcode()
diff --git a/src/devices/cpu/i386/i386op16.inc b/src/devices/cpu/i386/i386op16.hxx
index c7ce16553b0..c7ce16553b0 100644
--- a/src/devices/cpu/i386/i386op16.inc
+++ b/src/devices/cpu/i386/i386op16.hxx
diff --git a/src/devices/cpu/i386/i386op32.inc b/src/devices/cpu/i386/i386op32.hxx
index 89c7bab44b4..89c7bab44b4 100644
--- a/src/devices/cpu/i386/i386op32.inc
+++ b/src/devices/cpu/i386/i386op32.hxx
diff --git a/src/devices/cpu/i386/i386ops.inc b/src/devices/cpu/i386/i386ops.hxx
index 2f13445c8be..2f13445c8be 100644
--- a/src/devices/cpu/i386/i386ops.inc
+++ b/src/devices/cpu/i386/i386ops.hxx
diff --git a/src/devices/cpu/i386/i486ops.inc b/src/devices/cpu/i386/i486ops.hxx
index 8be406692d4..8be406692d4 100644
--- a/src/devices/cpu/i386/i486ops.inc
+++ b/src/devices/cpu/i386/i486ops.hxx
diff --git a/src/devices/cpu/i386/pentops.inc b/src/devices/cpu/i386/pentops.hxx
index 3b8eec56499..3b8eec56499 100644
--- a/src/devices/cpu/i386/pentops.inc
+++ b/src/devices/cpu/i386/pentops.hxx
diff --git a/src/devices/cpu/i386/x87ops.inc b/src/devices/cpu/i386/x87ops.hxx
index 1cc44e7b92f..1cc44e7b92f 100644
--- a/src/devices/cpu/i386/x87ops.inc
+++ b/src/devices/cpu/i386/x87ops.hxx
diff --git a/src/devices/cpu/i860/i860.cpp b/src/devices/cpu/i860/i860.cpp
index 4a02ab51dd6..d37079f31e2 100644
--- a/src/devices/cpu/i860/i860.cpp
+++ b/src/devices/cpu/i860/i860.cpp
@@ -234,4 +234,4 @@ offs_t i860_cpu_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8
/**************************************************************************
* The actual decode and execute code.
**************************************************************************/
-#include "i860dec.inc"
+#include "i860dec.hxx"
diff --git a/src/devices/cpu/i860/i860dec.inc b/src/devices/cpu/i860/i860dec.hxx
index 4600af7a0b8..4600af7a0b8 100644
--- a/src/devices/cpu/i860/i860dec.inc
+++ b/src/devices/cpu/i860/i860dec.hxx
diff --git a/src/devices/cpu/lh5801/5801tbl.inc b/src/devices/cpu/lh5801/5801tbl.hxx
index 98a8d7b1d02..98a8d7b1d02 100644
--- a/src/devices/cpu/lh5801/5801tbl.inc
+++ b/src/devices/cpu/lh5801/5801tbl.hxx
diff --git a/src/devices/cpu/lh5801/lh5801.cpp b/src/devices/cpu/lh5801/lh5801.cpp
index 76902136c29..efdb959080d 100644
--- a/src/devices/cpu/lh5801/lh5801.cpp
+++ b/src/devices/cpu/lh5801/lh5801.cpp
@@ -77,7 +77,7 @@ lh5801_cpu_device::lh5801_cpu_device(const machine_config &mconfig, const char *
/***************************************************************
* include the opcode macros, functions and tables
***************************************************************/
-#include "5801tbl.inc"
+#include "5801tbl.hxx"
void lh5801_cpu_device::device_start()
{
diff --git a/src/devices/cpu/lr35902/lr35902.cpp b/src/devices/cpu/lr35902/lr35902.cpp
index 1a7634c21e9..a3c281a1766 100644
--- a/src/devices/cpu/lr35902/lr35902.cpp
+++ b/src/devices/cpu/lr35902/lr35902.cpp
@@ -302,7 +302,7 @@ void lr35902_cpu_device::execute_run()
UINT8 x;
/* Execute instruction */
switch( m_op ) {
-#include "opc_main.inc"
+#include "opc_main.hxx"
default:
// actually this should lock up the cpu!
logerror("LR35902: Illegal opcode $%02X @ %04X\n", m_op, m_PC);
diff --git a/src/devices/cpu/lr35902/opc_cb.inc b/src/devices/cpu/lr35902/opc_cb.hxx
index 19470be9f3c..19470be9f3c 100644
--- a/src/devices/cpu/lr35902/opc_cb.inc
+++ b/src/devices/cpu/lr35902/opc_cb.hxx
diff --git a/src/devices/cpu/lr35902/opc_main.inc b/src/devices/cpu/lr35902/opc_main.hxx
index a02c36130ca..16a99d1d695 100644
--- a/src/devices/cpu/lr35902/opc_main.inc
+++ b/src/devices/cpu/lr35902/opc_main.hxx
@@ -1112,7 +1112,7 @@ case 0xCB: /* PREFIX! */
x = mem_read_byte( m_PC++ );
switch (x)
{
- #include "opc_cb.inc"
+ #include "opc_cb.hxx"
}
break;
case 0xCC: /* CALL Z,n16 */
diff --git a/src/devices/cpu/m6502/deco16.cpp b/src/devices/cpu/m6502/deco16.cpp
index b0651e97171..30ae298daa6 100644
--- a/src/devices/cpu/m6502/deco16.cpp
+++ b/src/devices/cpu/m6502/deco16.cpp
@@ -51,4 +51,4 @@ const address_space_config *deco16_device::memory_space_config(address_spacenum
}
}
-#include "cpu/m6502/deco16.inc"
+#include "cpu/m6502/deco16.hxx"
diff --git a/src/devices/cpu/m6502/m4510.cpp b/src/devices/cpu/m6502/m4510.cpp
index b741b7dbeca..1b52ef569c8 100644
--- a/src/devices/cpu/m6502/m4510.cpp
+++ b/src/devices/cpu/m6502/m4510.cpp
@@ -105,4 +105,4 @@ UINT8 m4510_device::mi_4510_nd::read_arg(UINT16 adr)
return program->read_byte(base->map(adr));
}
-#include "cpu/m6502/m4510.inc"
+#include "cpu/m6502/m4510.hxx"
diff --git a/src/devices/cpu/m6502/m6502.cpp b/src/devices/cpu/m6502/m6502.cpp
index a6bf400151c..4f18eda7c14 100644
--- a/src/devices/cpu/m6502/m6502.cpp
+++ b/src/devices/cpu/m6502/m6502.cpp
@@ -723,4 +723,4 @@ WRITE_LINE_MEMBER( m6502_device::nmi_line )
set_input_line( M6502_NMI_LINE, state );
}
-#include "cpu/m6502/m6502.inc"
+#include "cpu/m6502/m6502.hxx"
diff --git a/src/devices/cpu/m6502/m6509.cpp b/src/devices/cpu/m6502/m6509.cpp
index ec21e4c725c..d5a82a11fde 100644
--- a/src/devices/cpu/m6502/m6509.cpp
+++ b/src/devices/cpu/m6502/m6509.cpp
@@ -145,4 +145,4 @@ UINT8 m6509_device::mi_6509_nd::read_arg(UINT16 adr)
return res;
}
-#include "cpu/m6502/m6509.inc"
+#include "cpu/m6502/m6509.hxx"
diff --git a/src/devices/cpu/m6502/m6510.cpp b/src/devices/cpu/m6502/m6510.cpp
index 5ab9b0a6259..32ee2d6d4e0 100644
--- a/src/devices/cpu/m6502/m6510.cpp
+++ b/src/devices/cpu/m6502/m6510.cpp
@@ -172,4 +172,4 @@ UINT8 m6510_device::mi_6510_nd::read_arg(UINT16 adr)
return res;
}
-#include "cpu/m6502/m6510.inc"
+#include "cpu/m6502/m6510.hxx"
diff --git a/src/devices/cpu/m6502/m65c02.cpp b/src/devices/cpu/m6502/m65c02.cpp
index 4f02de6471c..8af7e663e8b 100644
--- a/src/devices/cpu/m6502/m65c02.cpp
+++ b/src/devices/cpu/m6502/m65c02.cpp
@@ -29,4 +29,4 @@ offs_t m65c02_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *o
return disassemble_generic(buffer, pc, oprom, opram, options, disasm_entries);
}
-#include "cpu/m6502/m65c02.inc"
+#include "cpu/m6502/m65c02.hxx"
diff --git a/src/devices/cpu/m6502/m65ce02.cpp b/src/devices/cpu/m6502/m65ce02.cpp
index ca7d72289a1..50b7dcb2129 100644
--- a/src/devices/cpu/m6502/m65ce02.cpp
+++ b/src/devices/cpu/m6502/m65ce02.cpp
@@ -95,4 +95,4 @@ void m65ce02_device::state_string_export(const device_state_entry &entry, std::s
}
}
-#include "cpu/m6502/m65ce02.inc"
+#include "cpu/m6502/m65ce02.hxx"
diff --git a/src/devices/cpu/m6502/m740.cpp b/src/devices/cpu/m6502/m740.cpp
index b5dc72f87f9..3659a773ef5 100644
--- a/src/devices/cpu/m6502/m740.cpp
+++ b/src/devices/cpu/m6502/m740.cpp
@@ -240,4 +240,4 @@ void m740_device::set_irq_line(int line, int state)
// printf("M740 single IRQ state is %d (MPX %08x, vector %x)\n", irq_state, m_irq_multiplex, m_irq_vector);
}
-#include "cpu/m6502/m740.inc"
+#include "cpu/m6502/m740.hxx"
diff --git a/src/devices/cpu/m6502/n2a03.cpp b/src/devices/cpu/m6502/n2a03.cpp
index f168995ce5f..36d50261f3f 100644
--- a/src/devices/cpu/m6502/n2a03.cpp
+++ b/src/devices/cpu/m6502/n2a03.cpp
@@ -139,4 +139,4 @@ machine_config_constructor n2a03_device::device_mconfig_additions() const
}
-#include "cpu/m6502/n2a03.inc"
+#include "cpu/m6502/n2a03.hxx"
diff --git a/src/devices/cpu/m6502/r65c02.cpp b/src/devices/cpu/m6502/r65c02.cpp
index 3101ffd0341..7aca4506731 100644
--- a/src/devices/cpu/m6502/r65c02.cpp
+++ b/src/devices/cpu/m6502/r65c02.cpp
@@ -28,4 +28,4 @@ offs_t r65c02_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *o
return disassemble_generic(buffer, pc, oprom, opram, options, disasm_entries);
}
-#include "cpu/m6502/r65c02.inc"
+#include "cpu/m6502/r65c02.hxx"
diff --git a/src/devices/cpu/m6800/6800ops.inc b/src/devices/cpu/m6800/6800ops.hxx
index 45a78d1d71f..45a78d1d71f 100644
--- a/src/devices/cpu/m6800/6800ops.inc
+++ b/src/devices/cpu/m6800/6800ops.hxx
diff --git a/src/devices/cpu/m6800/6800tbl.inc b/src/devices/cpu/m6800/6800tbl.hxx
index 09c86bd8093..09c86bd8093 100644
--- a/src/devices/cpu/m6800/6800tbl.inc
+++ b/src/devices/cpu/m6800/6800tbl.hxx
diff --git a/src/devices/cpu/m6800/m6800.cpp b/src/devices/cpu/m6800/m6800.cpp
index ecdcfa95186..f19cc15b4ba 100644
--- a/src/devices/cpu/m6800/m6800.cpp
+++ b/src/devices/cpu/m6800/m6800.cpp
@@ -838,10 +838,10 @@ void m6800_cpu_device::write_port2()
}
/* include the opcode prototypes and function pointer tables */
-#include "6800tbl.inc"
+#include "6800tbl.hxx"
/* include the opcode functions */
-#include "6800ops.inc"
+#include "6800ops.hxx"
int m6800_cpu_device::m6800_rx()
{
diff --git a/src/devices/cpu/m68000/m68kcpu.cpp b/src/devices/cpu/m68000/m68kcpu.cpp
index 3adef0173ba..7a76094bdc5 100644
--- a/src/devices/cpu/m68000/m68kcpu.cpp
+++ b/src/devices/cpu/m68000/m68kcpu.cpp
@@ -29,7 +29,7 @@ static const char copyright_notice[] =
#include "m68kcpu.h"
#include "m68kops.h"
-#include "m68kfpu.inc"
+#include "m68kfpu.hxx"
#include "m68kmmu.h"
extern void m68040_fpu_op0(m68000_base_device *m68k);
diff --git a/src/devices/cpu/m68000/m68kfpu.inc b/src/devices/cpu/m68000/m68kfpu.hxx
index 5c0d884311e..5c0d884311e 100644
--- a/src/devices/cpu/m68000/m68kfpu.inc
+++ b/src/devices/cpu/m68000/m68kfpu.hxx
diff --git a/src/devices/cpu/m6805/6805ops.inc b/src/devices/cpu/m6805/6805ops.hxx
index c6761982c96..c6761982c96 100644
--- a/src/devices/cpu/m6805/6805ops.inc
+++ b/src/devices/cpu/m6805/6805ops.hxx
diff --git a/src/devices/cpu/m6805/m6805.cpp b/src/devices/cpu/m6805/m6805.cpp
index 9a7effe5c5c..65d7fd86a55 100644
--- a/src/devices/cpu/m6805/m6805.cpp
+++ b/src/devices/cpu/m6805/m6805.cpp
@@ -561,7 +561,7 @@ void m6805_device::execute_set_input(int inputnum, int state)
}
}
-#include "6805ops.inc"
+#include "6805ops.hxx"
//-------------------------------------------------
// execute_clocks_to_cycles - convert the raw
diff --git a/src/devices/cpu/m6809/hd6309.cpp b/src/devices/cpu/m6809/hd6309.cpp
index 712c6bcf45e..8ca8c3d15c5 100644
--- a/src/devices/cpu/m6809/hd6309.cpp
+++ b/src/devices/cpu/m6809/hd6309.cpp
@@ -795,7 +795,7 @@ inline void hd6309_device::execute_one()
{
switch(pop_state())
{
-#include "cpu/m6809/hd6309.inc"
+#include "cpu/m6809/hd6309.hxx"
}
}
diff --git a/src/devices/cpu/m6809/konami.cpp b/src/devices/cpu/m6809/konami.cpp
index 618b298fcc7..40775327a82 100644
--- a/src/devices/cpu/m6809/konami.cpp
+++ b/src/devices/cpu/m6809/konami.cpp
@@ -361,7 +361,7 @@ inline void konami_cpu_device::execute_one()
{
switch(pop_state())
{
-#include "cpu/m6809/konami.inc"
+#include "cpu/m6809/konami.hxx"
}
}
diff --git a/src/devices/cpu/m6809/m6809.cpp b/src/devices/cpu/m6809/m6809.cpp
index d52fcb0fe40..c0b757a38e0 100644
--- a/src/devices/cpu/m6809/m6809.cpp
+++ b/src/devices/cpu/m6809/m6809.cpp
@@ -529,7 +529,7 @@ void m6809_base_device::execute_one()
{
switch(pop_state())
{
-#include "cpu/m6809/m6809.inc"
+#include "cpu/m6809/m6809.hxx"
}
}
diff --git a/src/devices/cpu/mc68hc11/hc11ops.inc b/src/devices/cpu/mc68hc11/hc11ops.hxx
index cb71a839c2f..cb71a839c2f 100644
--- a/src/devices/cpu/mc68hc11/hc11ops.inc
+++ b/src/devices/cpu/mc68hc11/hc11ops.hxx
diff --git a/src/devices/cpu/mc68hc11/mc68hc11.cpp b/src/devices/cpu/mc68hc11/mc68hc11.cpp
index 0d5a54b402e..0bace4613d3 100644
--- a/src/devices/cpu/mc68hc11/mc68hc11.cpp
+++ b/src/devices/cpu/mc68hc11/mc68hc11.cpp
@@ -353,7 +353,7 @@ void mc68hc11_cpu_device::WRITE16(UINT32 address, UINT16 value)
/*****************************************************************************/
-#include "hc11ops.inc"
+#include "hc11ops.hxx"
#include "hc11ops.h"
void mc68hc11_cpu_device::device_start()
diff --git a/src/devices/cpu/mcs51/mcs51.cpp b/src/devices/cpu/mcs51/mcs51.cpp
index f0b0a1d3723..6723abefe37 100644
--- a/src/devices/cpu/mcs51/mcs51.cpp
+++ b/src/devices/cpu/mcs51/mcs51.cpp
@@ -1343,7 +1343,7 @@ void mcs51_cpu_device::i8051_set_serial_rx_callback(read8_delegate rx_func)
#define OPHANDLER( _name ) void mcs51_cpu_device::_name (UINT8 r)
-#include "mcs51ops.inc"
+#include "mcs51ops.hxx"
void mcs51_cpu_device::execute_op(UINT8 op)
diff --git a/src/devices/cpu/mcs51/mcs51ops.inc b/src/devices/cpu/mcs51/mcs51ops.hxx
index 0c1dec682ef..0c1dec682ef 100644
--- a/src/devices/cpu/mcs51/mcs51ops.inc
+++ b/src/devices/cpu/mcs51/mcs51ops.hxx
diff --git a/src/devices/cpu/mcs96/i8x9x.cpp b/src/devices/cpu/mcs96/i8x9x.cpp
index f235cf90c28..a0616c0b223 100644
--- a/src/devices/cpu/mcs96/i8x9x.cpp
+++ b/src/devices/cpu/mcs96/i8x9x.cpp
@@ -371,4 +371,4 @@ p8098_device::p8098_device(const machine_config &mconfig, const char *tag, devic
const device_type C8095 = &device_creator<c8095_device>;
const device_type P8098 = &device_creator<p8098_device>;
-#include "cpu/mcs96/i8x9x.inc"
+#include "cpu/mcs96/i8x9x.hxx"
diff --git a/src/devices/cpu/mcs96/i8xc196.cpp b/src/devices/cpu/mcs96/i8xc196.cpp
index 19553280de2..ee1bcc229ce 100644
--- a/src/devices/cpu/mcs96/i8xc196.cpp
+++ b/src/devices/cpu/mcs96/i8xc196.cpp
@@ -73,4 +73,4 @@ void i8xc196_device::do_exec_partial()
{
}
-#include "cpu/mcs96/i8xc196.inc"
+#include "cpu/mcs96/i8xc196.hxx"
diff --git a/src/devices/cpu/mcs96/mcs96.cpp b/src/devices/cpu/mcs96/mcs96.cpp
index cca35f9ac42..4dd8c882870 100644
--- a/src/devices/cpu/mcs96/mcs96.cpp
+++ b/src/devices/cpu/mcs96/mcs96.cpp
@@ -749,4 +749,4 @@ void mcs96_device::set_nz16(UINT16 v)
PSW |= F_N;
}
-#include "cpu/mcs96/mcs96.inc"
+#include "cpu/mcs96/mcs96.hxx"
diff --git a/src/devices/cpu/nec/nec.cpp b/src/devices/cpu/nec/nec.cpp
index 610cd4e433c..b368d666ffe 100644
--- a/src/devices/cpu/nec/nec.cpp
+++ b/src/devices/cpu/nec/nec.cpp
@@ -314,7 +314,7 @@ void nec_common_device::external_int()
/* OPCODES */
/****************************************************************************/
-#include "necinstr.inc"
+#include "necinstr.hxx"
/*****************************************************************************/
diff --git a/src/devices/cpu/nec/necinstr.inc b/src/devices/cpu/nec/necinstr.hxx
index 9fc2d9cef5f..9fc2d9cef5f 100644
--- a/src/devices/cpu/nec/necinstr.inc
+++ b/src/devices/cpu/nec/necinstr.hxx
diff --git a/src/devices/cpu/nec/v25.cpp b/src/devices/cpu/nec/v25.cpp
index 2b0f4006e38..2333a525d9b 100644
--- a/src/devices/cpu/nec/v25.cpp
+++ b/src/devices/cpu/nec/v25.cpp
@@ -361,8 +361,8 @@ void v25_common_device::external_int()
/* OPCODES */
/****************************************************************************/
-#include "necinstr.inc"
-#include "v25instr.inc"
+#include "necinstr.hxx"
+#include "v25instr.hxx"
/*****************************************************************************/
diff --git a/src/devices/cpu/nec/v25instr.inc b/src/devices/cpu/nec/v25instr.hxx
index bd11b0626a8..bd11b0626a8 100644
--- a/src/devices/cpu/nec/v25instr.inc
+++ b/src/devices/cpu/nec/v25instr.hxx
diff --git a/src/devices/cpu/saturn/satops.inc b/src/devices/cpu/saturn/satops.hxx
index 8f7420584e3..8f7420584e3 100644
--- a/src/devices/cpu/saturn/satops.inc
+++ b/src/devices/cpu/saturn/satops.hxx
diff --git a/src/devices/cpu/saturn/sattable.inc b/src/devices/cpu/saturn/sattable.hxx
index f8b5398973c..f8b5398973c 100644
--- a/src/devices/cpu/saturn/sattable.inc
+++ b/src/devices/cpu/saturn/sattable.hxx
diff --git a/src/devices/cpu/saturn/saturn.cpp b/src/devices/cpu/saturn/saturn.cpp
index 98904446dd7..9993e118919 100644
--- a/src/devices/cpu/saturn/saturn.cpp
+++ b/src/devices/cpu/saturn/saturn.cpp
@@ -69,8 +69,8 @@ offs_t saturn_device::disasm_disassemble(char *buffer, offs_t pc, const UINT8 *o
* include the opcode macros, functions and tables
***************************************************************/
-#include "satops.inc"
-#include "sattable.inc"
+#include "satops.hxx"
+#include "sattable.hxx"
/*****************************************************************************
*
diff --git a/src/devices/cpu/sc61860/sc61860.cpp b/src/devices/cpu/sc61860/sc61860.cpp
index ac63f371132..4051d451561 100644
--- a/src/devices/cpu/sc61860/sc61860.cpp
+++ b/src/devices/cpu/sc61860/sc61860.cpp
@@ -89,8 +89,8 @@ TIMER_CALLBACK_MEMBER(sc61860_device::sc61860_2ms_tick)
/***************************************************************
* include the opcode macros, functions and tables
***************************************************************/
-#include "scops.inc"
-#include "sctable.inc"
+#include "scops.hxx"
+#include "sctable.hxx"
void sc61860_device::device_reset()
{
diff --git a/src/devices/cpu/sc61860/scops.inc b/src/devices/cpu/sc61860/scops.hxx
index 7bc5b05c987..7bc5b05c987 100644
--- a/src/devices/cpu/sc61860/scops.inc
+++ b/src/devices/cpu/sc61860/scops.hxx
diff --git a/src/devices/cpu/sc61860/sctable.inc b/src/devices/cpu/sc61860/sctable.hxx
index 2e16dc51033..2e16dc51033 100644
--- a/src/devices/cpu/sc61860/sctable.inc
+++ b/src/devices/cpu/sc61860/sctable.hxx
diff --git a/src/devices/cpu/sharc/compute.inc b/src/devices/cpu/sharc/compute.hxx
index 880b368ad1f..880b368ad1f 100644
--- a/src/devices/cpu/sharc/compute.inc
+++ b/src/devices/cpu/sharc/compute.hxx
diff --git a/src/devices/cpu/sharc/sharc.cpp b/src/devices/cpu/sharc/sharc.cpp
index bee241441ca..3c4cadf5386 100644
--- a/src/devices/cpu/sharc/sharc.cpp
+++ b/src/devices/cpu/sharc/sharc.cpp
@@ -224,9 +224,9 @@ void adsp21062_device::sharc_iop_w(UINT32 address, UINT32 data)
}
-#include "sharcmem.inc"
-#include "sharcdma.inc"
-#include "sharcops.inc"
+#include "sharcmem.hxx"
+#include "sharcdma.hxx"
+#include "sharcops.hxx"
#include "sharcops.h"
diff --git a/src/devices/cpu/sharc/sharcdma.inc b/src/devices/cpu/sharc/sharcdma.hxx
index eacede6fb5b..eacede6fb5b 100644
--- a/src/devices/cpu/sharc/sharcdma.inc
+++ b/src/devices/cpu/sharc/sharcdma.hxx
diff --git a/src/devices/cpu/sharc/sharcmem.inc b/src/devices/cpu/sharc/sharcmem.hxx
index 3427e0346b8..3427e0346b8 100644
--- a/src/devices/cpu/sharc/sharcmem.inc
+++ b/src/devices/cpu/sharc/sharcmem.hxx
diff --git a/src/devices/cpu/sharc/sharcops.inc b/src/devices/cpu/sharc/sharcops.hxx
index 5d3f70b7c04..5bcc9765f1c 100644
--- a/src/devices/cpu/sharc/sharcops.inc
+++ b/src/devices/cpu/sharc/sharcops.hxx
@@ -701,7 +701,7 @@ void adsp21062_device::SHIFT_OPERATION_IMM(int shiftop, int data, int rn, int rx
}
}
-#include "compute.inc"
+#include "compute.hxx"
void adsp21062_device::COMPUTE(UINT32 opcode)
{
diff --git a/src/devices/cpu/t11/t11.cpp b/src/devices/cpu/t11/t11.cpp
index f2337e6bae7..4930b956ea5 100644
--- a/src/devices/cpu/t11/t11.cpp
+++ b/src/devices/cpu/t11/t11.cpp
@@ -234,10 +234,10 @@ void t11_device::t11_check_irqs()
*************************************/
/* includes the static function prototypes and the master opcode table */
-#include "t11table.inc"
+#include "t11table.hxx"
/* includes the actual opcode implementations */
-#include "t11ops.inc"
+#include "t11ops.hxx"
diff --git a/src/devices/cpu/t11/t11ops.inc b/src/devices/cpu/t11/t11ops.hxx
index 223159a9357..223159a9357 100644
--- a/src/devices/cpu/t11/t11ops.inc
+++ b/src/devices/cpu/t11/t11ops.hxx
diff --git a/src/devices/cpu/t11/t11table.inc b/src/devices/cpu/t11/t11table.hxx
index 14a5ec825f1..14a5ec825f1 100644
--- a/src/devices/cpu/t11/t11table.inc
+++ b/src/devices/cpu/t11/t11table.hxx
diff --git a/src/devices/cpu/tlcs900/900tbl.inc b/src/devices/cpu/tlcs900/900tbl.hxx
index 551e27770c4..551e27770c4 100644
--- a/src/devices/cpu/tlcs900/900tbl.inc
+++ b/src/devices/cpu/tlcs900/900tbl.hxx
diff --git a/src/devices/cpu/tlcs900/tlcs900.cpp b/src/devices/cpu/tlcs900/tlcs900.cpp
index 2a7399de6bd..cc610e7906d 100644
--- a/src/devices/cpu/tlcs900/tlcs900.cpp
+++ b/src/devices/cpu/tlcs900/tlcs900.cpp
@@ -525,7 +525,7 @@ void tmp95c061_device::device_reset()
}
-#include "900tbl.inc"
+#include "900tbl.hxx"
#define TMP95C061_NUM_MASKABLE_IRQS 22
diff --git a/src/devices/cpu/tms32031/32031ops.inc b/src/devices/cpu/tms32031/32031ops.hxx
index eda4955ee34..eda4955ee34 100644
--- a/src/devices/cpu/tms32031/32031ops.inc
+++ b/src/devices/cpu/tms32031/32031ops.hxx
diff --git a/src/devices/cpu/tms32031/tms32031.cpp b/src/devices/cpu/tms32031/tms32031.cpp
index 692166b474a..ce6651d4fba 100644
--- a/src/devices/cpu/tms32031/tms32031.cpp
+++ b/src/devices/cpu/tms32031/tms32031.cpp
@@ -846,4 +846,4 @@ void tms3203x_device::execute_run()
// CORE OPCODES
//**************************************************************************
-#include "32031ops.inc"
+#include "32031ops.hxx"
diff --git a/src/devices/cpu/tms32051/32051ops.inc b/src/devices/cpu/tms32051/32051ops.hxx
index 83e769416a1..83e769416a1 100644
--- a/src/devices/cpu/tms32051/32051ops.inc
+++ b/src/devices/cpu/tms32051/32051ops.hxx
diff --git a/src/devices/cpu/tms32051/tms32051.cpp b/src/devices/cpu/tms32051/tms32051.cpp
index 5d35b7c025a..9bbde38dae0 100644
--- a/src/devices/cpu/tms32051/tms32051.cpp
+++ b/src/devices/cpu/tms32051/tms32051.cpp
@@ -148,7 +148,7 @@ void tms32051_device::DM_WRITE16(UINT16 address, UINT16 data)
m_data->write_word(address << 1, data);
}
-#include "32051ops.inc"
+#include "32051ops.hxx"
#include "32051ops.h"
void tms32051_device::op_group_be()
diff --git a/src/devices/cpu/tms34010/34010fld.inc b/src/devices/cpu/tms34010/34010fld.hxx
index ca05039dac0..ca05039dac0 100644
--- a/src/devices/cpu/tms34010/34010fld.inc
+++ b/src/devices/cpu/tms34010/34010fld.hxx
diff --git a/src/devices/cpu/tms34010/34010gfx.inc b/src/devices/cpu/tms34010/34010gfx.hxx
index 8a56f5f87d1..ece6085fd6e 100644
--- a/src/devices/cpu/tms34010/34010gfx.inc
+++ b/src/devices/cpu/tms34010/34010gfx.hxx
@@ -641,35 +641,35 @@ const tms340x0_device::pixblt_b_op_func tms340x0_device::s_fill_op_table[] =
/* 1bpp cases */
#define BITS_PER_PIXEL 1
#define FUNCTION_NAME(base) base##_1_op0
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 2bpp cases */
#define BITS_PER_PIXEL 2
#define FUNCTION_NAME(base) base##_2_op0
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 4bpp cases */
#define BITS_PER_PIXEL 4
#define FUNCTION_NAME(base) base##_4_op0
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 8bpp cases */
#define BITS_PER_PIXEL 8
#define FUNCTION_NAME(base) base##_8_op0
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 16bpp cases */
#define BITS_PER_PIXEL 16
#define FUNCTION_NAME(base) base##_16_op0
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
@@ -687,35 +687,35 @@ const tms340x0_device::pixblt_b_op_func tms340x0_device::s_fill_op_table[] =
/* 1bpp cases */
#define BITS_PER_PIXEL 1
#define FUNCTION_NAME(base) base##_1_opx
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 2bpp cases */
#define BITS_PER_PIXEL 2
#define FUNCTION_NAME(base) base##_2_opx
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 4bpp cases */
#define BITS_PER_PIXEL 4
#define FUNCTION_NAME(base) base##_4_opx
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 8bpp cases */
#define BITS_PER_PIXEL 8
#define FUNCTION_NAME(base) base##_8_opx
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 16bpp cases */
#define BITS_PER_PIXEL 16
#define FUNCTION_NAME(base) base##_16_opx
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
@@ -734,35 +734,35 @@ const tms340x0_device::pixblt_b_op_func tms340x0_device::s_fill_op_table[] =
/* 1bpp cases */
#define BITS_PER_PIXEL 1
#define FUNCTION_NAME(base) base##_1_op0_trans
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 2bpp cases */
#define BITS_PER_PIXEL 2
#define FUNCTION_NAME(base) base##_2_op0_trans
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 4bpp cases */
#define BITS_PER_PIXEL 4
#define FUNCTION_NAME(base) base##_4_op0_trans
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 8bpp cases */
#define BITS_PER_PIXEL 8
#define FUNCTION_NAME(base) base##_8_op0_trans
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 16bpp cases */
#define BITS_PER_PIXEL 16
#define FUNCTION_NAME(base) base##_16_op0_trans
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
@@ -780,35 +780,35 @@ const tms340x0_device::pixblt_b_op_func tms340x0_device::s_fill_op_table[] =
/* 1bpp cases */
#define BITS_PER_PIXEL 1
#define FUNCTION_NAME(base) base##_1_opx_trans
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 2bpp cases */
#define BITS_PER_PIXEL 2
#define FUNCTION_NAME(base) base##_2_opx_trans
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 4bpp cases */
#define BITS_PER_PIXEL 4
#define FUNCTION_NAME(base) base##_4_opx_trans
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 8bpp cases */
#define BITS_PER_PIXEL 8
#define FUNCTION_NAME(base) base##_8_opx_trans
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
/* 16bpp cases */
#define BITS_PER_PIXEL 16
#define FUNCTION_NAME(base) base##_16_opx_trans
- #include "34010gfx.inc"
+ #include "34010gfx.hxx"
#undef FUNCTION_NAME
#undef BITS_PER_PIXEL
diff --git a/src/devices/cpu/tms34010/34010ops.inc b/src/devices/cpu/tms34010/34010ops.hxx
index 6674d7a1faa..6674d7a1faa 100644
--- a/src/devices/cpu/tms34010/34010ops.inc
+++ b/src/devices/cpu/tms34010/34010ops.hxx
diff --git a/src/devices/cpu/tms34010/34010tbl.inc b/src/devices/cpu/tms34010/34010tbl.hxx
index 2cef83dcb9c..2cef83dcb9c 100644
--- a/src/devices/cpu/tms34010/34010tbl.inc
+++ b/src/devices/cpu/tms34010/34010tbl.hxx
diff --git a/src/devices/cpu/tms34010/tms34010.cpp b/src/devices/cpu/tms34010/tms34010.cpp
index 3bda4e028ac..3a5eb434554 100644
--- a/src/devices/cpu/tms34010/tms34010.cpp
+++ b/src/devices/cpu/tms34010/tms34010.cpp
@@ -458,14 +458,14 @@ UINT32 tms340x0_device::raster_op_21(UINT32 newpix, UINT32 oldpix) { return (old
OPCODE TABLE & IMPLEMENTATIONS
***************************************************************************/
-#include "34010fld.inc"
+#include "34010fld.hxx"
/* includes the static function prototypes and the master opcode table */
-#include "34010tbl.inc"
+#include "34010tbl.hxx"
/* includes the actual opcode implementations */
-#include "34010ops.inc"
-#include "34010gfx.inc"
+#include "34010ops.hxx"
+#include "34010gfx.hxx"
diff --git a/src/devices/cpu/tms57002/57002dsm.cpp b/src/devices/cpu/tms57002/57002dsm.cpp
index 960054806fc..db4a0d12b15 100644
--- a/src/devices/cpu/tms57002/57002dsm.cpp
+++ b/src/devices/cpu/tms57002/57002dsm.cpp
@@ -45,7 +45,7 @@ CPU_DISASSEMBLE(tms57002)
switch((opcode >> 11) & 0x7f) { // category 3
#define DASM3
-#include "cpu/tms57002/tms57002.inc"
+#include "cpu/tms57002/tms57002.hxx"
#undef DASM3
default:
@@ -59,7 +59,7 @@ CPU_DISASSEMBLE(tms57002)
break;
#define DASM1
-#include "cpu/tms57002/tms57002.inc"
+#include "cpu/tms57002/tms57002.hxx"
#undef DASM1
default:
@@ -82,7 +82,7 @@ CPU_DISASSEMBLE(tms57002)
break;
#define DASM2
-#include "cpu/tms57002/tms57002.inc"
+#include "cpu/tms57002/tms57002.hxx"
#undef DASM2
default:
diff --git a/src/devices/cpu/tms57002/tms57002.cpp b/src/devices/cpu/tms57002/tms57002.cpp
index f05b4cad4f1..93f8a3e7924 100644
--- a/src/devices/cpu/tms57002/tms57002.cpp
+++ b/src/devices/cpu/tms57002/tms57002.cpp
@@ -756,7 +756,7 @@ void tms57002_device::execute_run()
goto inst;
#define CINTRP
-#include "cpu/tms57002/tms57002.inc"
+#include "cpu/tms57002/tms57002.hxx"
#undef CINTRP
default:
diff --git a/src/devices/cpu/tms57002/tms57kdec.cpp b/src/devices/cpu/tms57002/tms57kdec.cpp
index b71d0695141..62061cc6cc7 100644
--- a/src/devices/cpu/tms57002/tms57kdec.cpp
+++ b/src/devices/cpu/tms57002/tms57kdec.cpp
@@ -93,7 +93,7 @@ void tms57002_device::decode_cat1(UINT32 opcode, unsigned short *op, cstate *cs)
break;
#define CDEC1
-#include "cpu/tms57002/tms57002.inc"
+#include "cpu/tms57002/tms57002.hxx"
#undef CDEC1
default:
@@ -109,7 +109,7 @@ void tms57002_device::decode_cat2_pre(UINT32 opcode, unsigned short *op, cstate
break;
#define CDEC2A
-#include "cpu/tms57002/tms57002.inc"
+#include "cpu/tms57002/tms57002.hxx"
#undef CDEC2A
default:
@@ -125,7 +125,7 @@ void tms57002_device::decode_cat2_post(UINT32 opcode, unsigned short *op, cstate
break;
#define CDEC2B
-#include "cpu/tms57002/tms57002.inc"
+#include "cpu/tms57002/tms57002.hxx"
#undef CDEC2B
default:
@@ -141,7 +141,7 @@ void tms57002_device::decode_cat3(UINT32 opcode, unsigned short *op, cstate *cs)
break;
#define CDEC3
-#include "cpu/tms57002/tms57002.inc"
+#include "cpu/tms57002/tms57002.hxx"
#undef CDEC3
default:
diff --git a/src/devices/cpu/tms7000/tms7000.cpp b/src/devices/cpu/tms7000/tms7000.cpp
index d64b47d924c..b604a9fa2d3 100644
--- a/src/devices/cpu/tms7000/tms7000.cpp
+++ b/src/devices/cpu/tms7000/tms7000.cpp
@@ -621,7 +621,7 @@ WRITE8_MEMBER(tms7000_device::tms7000_pf_w)
// execute
//-------------------------------------------------
-#include "tms70op.inc"
+#include "tms70op.hxx"
void tms7000_device::execute_run()
{
diff --git a/src/devices/cpu/tms7000/tms70op.inc b/src/devices/cpu/tms7000/tms70op.hxx
index 146ca419ff7..146ca419ff7 100644
--- a/src/devices/cpu/tms7000/tms70op.inc
+++ b/src/devices/cpu/tms7000/tms70op.hxx
diff --git a/src/devices/cpu/v60/am.inc b/src/devices/cpu/v60/am.hxx
index aa9c9687c8e..0432350788d 100644
--- a/src/devices/cpu/v60/am.inc
+++ b/src/devices/cpu/v60/am.hxx
@@ -9,9 +9,9 @@
// Addressing mode functions and tables
-#include "am1.inc" // ReadAM
-#include "am2.inc" // ReadAMAddress
-#include "am3.inc" // WriteAM
+#include "am1.hxx" // ReadAM
+#include "am2.hxx" // ReadAMAddress
+#include "am3.hxx" // WriteAM
/*
Input:
diff --git a/src/devices/cpu/v60/am1.inc b/src/devices/cpu/v60/am1.hxx
index cc5e0f4a1fd..cc5e0f4a1fd 100644
--- a/src/devices/cpu/v60/am1.inc
+++ b/src/devices/cpu/v60/am1.hxx
diff --git a/src/devices/cpu/v60/am2.inc b/src/devices/cpu/v60/am2.hxx
index 2b01d324979..2b01d324979 100644
--- a/src/devices/cpu/v60/am2.inc
+++ b/src/devices/cpu/v60/am2.hxx
diff --git a/src/devices/cpu/v60/am3.inc b/src/devices/cpu/v60/am3.hxx
index 93af406f266..93af406f266 100644
--- a/src/devices/cpu/v60/am3.inc
+++ b/src/devices/cpu/v60/am3.hxx
diff --git a/src/devices/cpu/v60/op12.inc b/src/devices/cpu/v60/op12.hxx
index 319e9995595..319e9995595 100644
--- a/src/devices/cpu/v60/op12.inc
+++ b/src/devices/cpu/v60/op12.hxx
diff --git a/src/devices/cpu/v60/op2.inc b/src/devices/cpu/v60/op2.hxx
index 98a8612f345..98a8612f345 100644
--- a/src/devices/cpu/v60/op2.inc
+++ b/src/devices/cpu/v60/op2.hxx
diff --git a/src/devices/cpu/v60/op3.inc b/src/devices/cpu/v60/op3.hxx
index 0f014d40909..0f014d40909 100644
--- a/src/devices/cpu/v60/op3.inc
+++ b/src/devices/cpu/v60/op3.hxx
diff --git a/src/devices/cpu/v60/op4.inc b/src/devices/cpu/v60/op4.hxx
index ca5b4cef4c6..ca5b4cef4c6 100644
--- a/src/devices/cpu/v60/op4.inc
+++ b/src/devices/cpu/v60/op4.hxx
diff --git a/src/devices/cpu/v60/op5.inc b/src/devices/cpu/v60/op5.hxx
index be6084eb6e1..be6084eb6e1 100644
--- a/src/devices/cpu/v60/op5.inc
+++ b/src/devices/cpu/v60/op5.hxx
diff --git a/src/devices/cpu/v60/op6.inc b/src/devices/cpu/v60/op6.hxx
index 087680534f9..087680534f9 100644
--- a/src/devices/cpu/v60/op6.inc
+++ b/src/devices/cpu/v60/op6.hxx
diff --git a/src/devices/cpu/v60/op7a.inc b/src/devices/cpu/v60/op7a.hxx
index 67a7b0fb82c..67a7b0fb82c 100644
--- a/src/devices/cpu/v60/op7a.inc
+++ b/src/devices/cpu/v60/op7a.hxx
diff --git a/src/devices/cpu/v60/optable.inc b/src/devices/cpu/v60/optable.hxx
index 87de19686bc..87de19686bc 100644
--- a/src/devices/cpu/v60/optable.inc
+++ b/src/devices/cpu/v60/optable.hxx
diff --git a/src/devices/cpu/v60/v60.cpp b/src/devices/cpu/v60/v60.cpp
index 61764add79a..0a202847f35 100644
--- a/src/devices/cpu/v60/v60.cpp
+++ b/src/devices/cpu/v60/v60.cpp
@@ -358,16 +358,16 @@ UINT32 v60_device::v60_update_psw_for_exception(int is_interrupt, int target_lev
// Addressing mode decoding functions
-#include "am.inc"
+#include "am.hxx"
// Opcode functions
-#include "op12.inc"
-#include "op2.inc"
-#include "op3.inc"
-#include "op4.inc"
-#include "op5.inc"
-#include "op6.inc"
-#include "op7a.inc"
+#include "op12.hxx"
+#include "op2.hxx"
+#include "op3.hxx"
+#include "op4.hxx"
+#include "op5.hxx"
+#include "op6.hxx"
+#include "op7a.hxx"
UINT32 v60_device::opUNHANDLED()
{
@@ -376,7 +376,7 @@ UINT32 v60_device::opUNHANDLED()
}
// Opcode jump table
-#include "optable.inc"
+#include "optable.hxx"
void v60_device::device_start()
{
diff --git a/src/devices/cpu/z180/z180.cpp b/src/devices/cpu/z180/z180.cpp
index 7b389baec26..8cff26069c0 100644
--- a/src/devices/cpu/z180/z180.cpp
+++ b/src/devices/cpu/z180/z180.cpp
@@ -762,12 +762,12 @@ static std::unique_ptr<UINT8[]> SZHVC_sub;
#include "z180ops.h"
#include "z180tbl.h"
-#include "z180cb.inc"
-#include "z180xy.inc"
-#include "z180dd.inc"
-#include "z180fd.inc"
-#include "z180ed.inc"
-#include "z180op.inc"
+#include "z180cb.hxx"
+#include "z180xy.hxx"
+#include "z180dd.hxx"
+#include "z180fd.hxx"
+#include "z180ed.hxx"
+#include "z180op.hxx"
const address_space_config *z180_device::memory_space_config(address_spacenum spacenum) const
diff --git a/src/devices/cpu/z180/z180cb.inc b/src/devices/cpu/z180/z180cb.hxx
index 3a58725024e..3a58725024e 100644
--- a/src/devices/cpu/z180/z180cb.inc
+++ b/src/devices/cpu/z180/z180cb.hxx
diff --git a/src/devices/cpu/z180/z180dd.inc b/src/devices/cpu/z180/z180dd.hxx
index bd2a9fc7137..bd2a9fc7137 100644
--- a/src/devices/cpu/z180/z180dd.inc
+++ b/src/devices/cpu/z180/z180dd.hxx
diff --git a/src/devices/cpu/z180/z180ed.inc b/src/devices/cpu/z180/z180ed.hxx
index 91520228f87..91520228f87 100644
--- a/src/devices/cpu/z180/z180ed.inc
+++ b/src/devices/cpu/z180/z180ed.hxx
diff --git a/src/devices/cpu/z180/z180fd.inc b/src/devices/cpu/z180/z180fd.hxx
index 66697a9b997..66697a9b997 100644
--- a/src/devices/cpu/z180/z180fd.inc
+++ b/src/devices/cpu/z180/z180fd.hxx
diff --git a/src/devices/cpu/z180/z180op.inc b/src/devices/cpu/z180/z180op.hxx
index c00515ee9a5..c00515ee9a5 100644
--- a/src/devices/cpu/z180/z180op.inc
+++ b/src/devices/cpu/z180/z180op.hxx
diff --git a/src/devices/cpu/z180/z180xy.inc b/src/devices/cpu/z180/z180xy.hxx
index e8976079dfd..e8976079dfd 100644
--- a/src/devices/cpu/z180/z180xy.inc
+++ b/src/devices/cpu/z180/z180xy.hxx
diff --git a/src/devices/cpu/z8/z8.cpp b/src/devices/cpu/z8/z8.cpp
index ad8b79f8ba5..53aecb48b1b 100644
--- a/src/devices/cpu/z8/z8.cpp
+++ b/src/devices/cpu/z8/z8.cpp
@@ -541,7 +541,7 @@ INSTRUCTION( illegal )
logerror("Z8: PC = %04x, Illegal opcode = %02x\n", m_pc - 1, opcode);
}
-#include "z8ops.inc"
+#include "z8ops.hxx"
/***************************************************************************
OPCODE TABLES
diff --git a/src/devices/cpu/z8/z8ops.inc b/src/devices/cpu/z8/z8ops.hxx
index 4c522791b8e..4c522791b8e 100644
--- a/src/devices/cpu/z8/z8ops.inc
+++ b/src/devices/cpu/z8/z8ops.hxx
diff --git a/src/devices/cpu/z8000/z8000.cpp b/src/devices/cpu/z8000/z8000.cpp
index 9f71abf47a8..910402cf1b3 100644
--- a/src/devices/cpu/z8000/z8000.cpp
+++ b/src/devices/cpu/z8000/z8000.cpp
@@ -360,8 +360,8 @@ void z8002_device::cycles(int cycles)
m_icount -= cycles;
}
-#include "z8000ops.inc"
-#include "z8000tbl.inc"
+#include "z8000ops.hxx"
+#include "z8000tbl.hxx"
void z8002_device::set_irq(int type)
{
diff --git a/src/devices/cpu/z8000/z8000ops.inc b/src/devices/cpu/z8000/z8000ops.hxx
index c9d0b365783..c9d0b365783 100644
--- a/src/devices/cpu/z8000/z8000ops.inc
+++ b/src/devices/cpu/z8000/z8000ops.hxx
diff --git a/src/devices/cpu/z8000/z8000tbl.inc b/src/devices/cpu/z8000/z8000tbl.hxx
index 39f4a3c192c..39f4a3c192c 100644
--- a/src/devices/cpu/z8000/z8000tbl.inc
+++ b/src/devices/cpu/z8000/z8000tbl.hxx
diff --git a/src/devices/machine/s3c2400.cpp b/src/devices/machine/s3c2400.cpp
index a1ef609a1ac..dec1ad8bf11 100644
--- a/src/devices/machine/s3c2400.cpp
+++ b/src/devices/machine/s3c2400.cpp
@@ -31,7 +31,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
#define DEVICE_S3C2400
#define S3C24_CLASS_NAME s3c2400_device
-#include "machine/s3c24xx.inc"
+#include "machine/s3c24xx.hxx"
#undef DEVICE_S3C2400
UINT32 s3c2400_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/devices/machine/s3c2410.cpp b/src/devices/machine/s3c2410.cpp
index c89a67ef47b..3ba6e373a4c 100644
--- a/src/devices/machine/s3c2410.cpp
+++ b/src/devices/machine/s3c2410.cpp
@@ -31,7 +31,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
#define DEVICE_S3C2410
#define S3C24_CLASS_NAME s3c2410_device
-#include "machine/s3c24xx.inc"
+#include "machine/s3c24xx.hxx"
#undef DEVICE_S3C2410
UINT32 s3c2410_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/devices/machine/s3c2440.cpp b/src/devices/machine/s3c2440.cpp
index 7cc5e0a6247..360f83f244d 100644
--- a/src/devices/machine/s3c2440.cpp
+++ b/src/devices/machine/s3c2440.cpp
@@ -31,7 +31,7 @@ static inline void ATTR_PRINTF(3,4) verboselog( device_t &device, int n_level, c
#define DEVICE_S3C2440
#define S3C24_CLASS_NAME s3c2440_device
-#include "machine/s3c24xx.inc"
+#include "machine/s3c24xx.hxx"
#undef DEVICE_S3C2440
UINT32 s3c2440_device::screen_update(screen_device &screen, bitmap_rgb32 &bitmap, const rectangle &cliprect)
diff --git a/src/devices/machine/s3c24xx.inc b/src/devices/machine/s3c24xx.hxx
index ca7bc05a90d..ca7bc05a90d 100644
--- a/src/devices/machine/s3c24xx.inc
+++ b/src/devices/machine/s3c24xx.hxx
diff --git a/src/devices/sound/disc_dev.inc b/src/devices/sound/disc_dev.hxx
index da859e471ec..da859e471ec 100644
--- a/src/devices/sound/disc_dev.inc
+++ b/src/devices/sound/disc_dev.hxx
diff --git a/src/devices/sound/disc_flt.inc b/src/devices/sound/disc_flt.hxx
index 18cb8f41c1c..18cb8f41c1c 100644
--- a/src/devices/sound/disc_flt.inc
+++ b/src/devices/sound/disc_flt.hxx
diff --git a/src/devices/sound/disc_inp.inc b/src/devices/sound/disc_inp.hxx
index 1116d074546..1116d074546 100644
--- a/src/devices/sound/disc_inp.inc
+++ b/src/devices/sound/disc_inp.hxx
diff --git a/src/devices/sound/disc_mth.inc b/src/devices/sound/disc_mth.hxx
index 9825ee0b899..9825ee0b899 100644
--- a/src/devices/sound/disc_mth.inc
+++ b/src/devices/sound/disc_mth.hxx
diff --git a/src/devices/sound/disc_sys.inc b/src/devices/sound/disc_sys.hxx
index a166f71ce49..a166f71ce49 100644
--- a/src/devices/sound/disc_sys.inc
+++ b/src/devices/sound/disc_sys.hxx
diff --git a/src/devices/sound/disc_wav.inc b/src/devices/sound/disc_wav.hxx
index 8087ea86627..8087ea86627 100644
--- a/src/devices/sound/disc_wav.inc
+++ b/src/devices/sound/disc_wav.hxx
diff --git a/src/devices/sound/discrete.cpp b/src/devices/sound/discrete.cpp
index a2232bc9f44..80498db791f 100644
--- a/src/devices/sound/discrete.cpp
+++ b/src/devices/sound/discrete.cpp
@@ -157,12 +157,12 @@ private:
*
*************************************/
-#include "disc_sys.inc" /* discrete core modules and support functions */
-#include "disc_wav.inc" /* Wave sources - SINE/SQUARE/NOISE/etc */
-#include "disc_mth.inc" /* Math Devices - ADD/GAIN/etc */
-#include "disc_inp.inc" /* Input Devices - INPUT/CONST/etc */
-#include "disc_flt.inc" /* Filter Devices - RCF/HPF/LPF */
-#include "disc_dev.inc" /* Popular Devices - NE555/etc */
+#include "disc_sys.hxx" /* discrete core modules and support functions */
+#include "disc_wav.hxx" /* Wave sources - SINE/SQUARE/NOISE/etc */
+#include "disc_mth.hxx" /* Math Devices - ADD/GAIN/etc */
+#include "disc_inp.hxx" /* Input Devices - INPUT/CONST/etc */
+#include "disc_flt.hxx" /* Filter Devices - RCF/HPF/LPF */
+#include "disc_dev.hxx" /* Popular Devices - NE555/etc */
/*************************************
*
diff --git a/src/devices/sound/tms5110.cpp b/src/devices/sound/tms5110.cpp
index 6e7de3e445c..d0d676e742e 100644
--- a/src/devices/sound/tms5110.cpp
+++ b/src/devices/sound/tms5110.cpp
@@ -143,7 +143,7 @@ static INT16 clip_analog(INT16 cliptemp);
/* Pull in the ROM tables */
-#include "tms5110r.inc"
+#include "tms5110r.hxx"
#define DEBUG_5110 0
diff --git a/src/devices/sound/tms5110r.inc b/src/devices/sound/tms5110r.hxx
index 45fe4c984b2..45fe4c984b2 100644
--- a/src/devices/sound/tms5110r.inc
+++ b/src/devices/sound/tms5110r.hxx
diff --git a/src/devices/sound/tms5220.cpp b/src/devices/sound/tms5220.cpp
index bb050d53182..d9da8b973bd 100644
--- a/src/devices/sound/tms5220.cpp
+++ b/src/devices/sound/tms5220.cpp
@@ -394,7 +394,7 @@ static INT16 clip_analog(INT16 cliptemp);
static const UINT8 reload_table[4] = { 0, 2, 4, 6 }; //sample count reload for 5220c and cd2501ecd only; 5200 and 5220 always reload with 0; keep in mind this is loaded on IP=0 PC=12 subcycle=1 so it immediately will increment after one sample, effectively being 1,3,5,7 as in the comments above.
// Pull in the ROM tables
-#include "tms5110r.inc"
+#include "tms5110r.hxx"
void tms5220_device::set_variant(int variant)
diff --git a/src/devices/sound/vlm5030.cpp b/src/devices/sound/vlm5030.cpp
index 3bd8928e3e5..d47981affbb 100644
--- a/src/devices/sound/vlm5030.cpp
+++ b/src/devices/sound/vlm5030.cpp
@@ -134,7 +134,7 @@ enum {
};
/* Pull in the ROM tables */
-#include "tms5110r.inc"
+#include "tms5110r.hxx"
/*
speed parameter
diff --git a/src/devices/video/epic12_blit0.cpp b/src/devices/video/epic12_blit0.cpp
index 3588573bdee..8bd7d8a4ff3 100644
--- a/src/devices/video/epic12_blit0.cpp
+++ b/src/devices/video/epic12_blit0.cpp
@@ -12,7 +12,7 @@
/* Special Case */
#define BLENDED 0
#define FUNCNAME draw_sprite_f0_ti0_plain
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef BLENDED
@@ -22,7 +22,7 @@
#define _SMODE 0
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr1_s0_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -30,7 +30,7 @@
#define _SMODE 1
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr1_s1_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -38,7 +38,7 @@
#define _SMODE 2
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr1_s2_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -46,7 +46,7 @@
#define _SMODE 3
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr1_s3_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -54,7 +54,7 @@
#define _SMODE 4
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr1_s4_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -62,7 +62,7 @@
#define _SMODE 5
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr1_s5_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -70,7 +70,7 @@
#define _SMODE 6
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr1_s6_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -78,7 +78,7 @@
#define _SMODE 7
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr1_s7_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -89,7 +89,7 @@
#define _SMODE 0
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr1_s0_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -97,7 +97,7 @@
#define _SMODE 1
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr1_s1_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -105,7 +105,7 @@
#define _SMODE 2
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr1_s2_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -113,7 +113,7 @@
#define _SMODE 3
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr1_s3_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -121,7 +121,7 @@
#define _SMODE 4
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr1_s4_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -129,7 +129,7 @@
#define _SMODE 5
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr1_s5_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -137,7 +137,7 @@
#define _SMODE 6
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr1_s6_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -145,7 +145,7 @@
#define _SMODE 7
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr1_s7_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -156,7 +156,7 @@
#define _SMODE 0
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr1_s0_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -164,7 +164,7 @@
#define _SMODE 1
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr1_s1_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -172,7 +172,7 @@
#define _SMODE 2
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr1_s2_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -180,7 +180,7 @@
#define _SMODE 3
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr1_s3_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -188,7 +188,7 @@
#define _SMODE 4
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr1_s4_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -196,7 +196,7 @@
#define _SMODE 5
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr1_s5_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -204,7 +204,7 @@
#define _SMODE 6
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr1_s6_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -212,7 +212,7 @@
#define _SMODE 7
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr1_s7_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -223,7 +223,7 @@
#define _SMODE 0
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr1_s0_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -231,7 +231,7 @@
#define _SMODE 1
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr1_s1_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -239,7 +239,7 @@
#define _SMODE 2
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr1_s2_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -247,7 +247,7 @@
#define _SMODE 3
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr1_s3_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -255,7 +255,7 @@
#define _SMODE 4
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr1_s4_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -263,7 +263,7 @@
#define _SMODE 5
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr1_s5_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -271,7 +271,7 @@
#define _SMODE 6
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr1_s6_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -279,7 +279,7 @@
#define _SMODE 7
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr1_s7_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -290,7 +290,7 @@
#define _SMODE 0
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr1_s0_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -298,7 +298,7 @@
#define _SMODE 1
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr1_s1_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -306,7 +306,7 @@
#define _SMODE 2
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr1_s2_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -314,7 +314,7 @@
#define _SMODE 3
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr1_s3_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -322,7 +322,7 @@
#define _SMODE 4
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr1_s4_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -330,7 +330,7 @@
#define _SMODE 5
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr1_s5_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -338,7 +338,7 @@
#define _SMODE 6
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr1_s6_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -346,7 +346,7 @@
#define _SMODE 7
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr1_s7_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -356,7 +356,7 @@
#define _SMODE 0
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr1_s0_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -364,7 +364,7 @@
#define _SMODE 1
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr1_s1_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -372,7 +372,7 @@
#define _SMODE 2
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr1_s2_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -380,7 +380,7 @@
#define _SMODE 3
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr1_s3_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -388,7 +388,7 @@
#define _SMODE 4
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr1_s4_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -396,7 +396,7 @@
#define _SMODE 5
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr1_s5_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -404,7 +404,7 @@
#define _SMODE 6
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr1_s6_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -412,7 +412,7 @@
#define _SMODE 7
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr1_s7_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -422,7 +422,7 @@
#define _SMODE 0
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr1_s0_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -430,7 +430,7 @@
#define _SMODE 1
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr1_s1_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -438,7 +438,7 @@
#define _SMODE 2
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr1_s2_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -446,7 +446,7 @@
#define _SMODE 3
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr1_s3_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -454,7 +454,7 @@
#define _SMODE 4
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr1_s4_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -462,7 +462,7 @@
#define _SMODE 5
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr1_s5_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -470,7 +470,7 @@
#define _SMODE 6
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr1_s6_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -478,7 +478,7 @@
#define _SMODE 7
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr1_s7_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -489,7 +489,7 @@
#define _SMODE 0
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr1_s0_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -497,7 +497,7 @@
#define _SMODE 1
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr1_s1_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -505,7 +505,7 @@
#define _SMODE 2
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr1_s2_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -513,7 +513,7 @@
#define _SMODE 3
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr1_s3_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -521,7 +521,7 @@
#define _SMODE 4
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr1_s4_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -529,7 +529,7 @@
#define _SMODE 5
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr1_s5_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -537,7 +537,7 @@
#define _SMODE 6
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr1_s6_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -545,7 +545,7 @@
#define _SMODE 7
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr1_s7_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
diff --git a/src/devices/video/epic12_blit1.cpp b/src/devices/video/epic12_blit1.cpp
index 2cef4fae933..7ef055ce463 100644
--- a/src/devices/video/epic12_blit1.cpp
+++ b/src/devices/video/epic12_blit1.cpp
@@ -12,7 +12,7 @@
/* Special Case */
#define BLENDED 0
#define FUNCNAME draw_sprite_f0_ti0_tr0_plain
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef BLENDED
@@ -22,7 +22,7 @@
#define _SMODE 0
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr0_s0_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -30,7 +30,7 @@
#define _SMODE 1
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr0_s1_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -38,7 +38,7 @@
#define _SMODE 2
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr0_s2_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -46,7 +46,7 @@
#define _SMODE 3
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr0_s3_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -54,7 +54,7 @@
#define _SMODE 4
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr0_s4_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -62,7 +62,7 @@
#define _SMODE 5
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr0_s5_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -70,7 +70,7 @@
#define _SMODE 6
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr0_s6_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -78,7 +78,7 @@
#define _SMODE 7
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti0_tr0_s7_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -89,7 +89,7 @@
#define _SMODE 0
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr0_s0_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -97,7 +97,7 @@
#define _SMODE 1
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr0_s1_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -105,7 +105,7 @@
#define _SMODE 2
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr0_s2_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -113,7 +113,7 @@
#define _SMODE 3
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr0_s3_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -121,7 +121,7 @@
#define _SMODE 4
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr0_s4_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -129,7 +129,7 @@
#define _SMODE 5
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr0_s5_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -137,7 +137,7 @@
#define _SMODE 6
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr0_s6_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -145,7 +145,7 @@
#define _SMODE 7
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti0_tr0_s7_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -156,7 +156,7 @@
#define _SMODE 0
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr0_s0_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -164,7 +164,7 @@
#define _SMODE 1
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr0_s1_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -172,7 +172,7 @@
#define _SMODE 2
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr0_s2_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -180,7 +180,7 @@
#define _SMODE 3
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr0_s3_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -188,7 +188,7 @@
#define _SMODE 4
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr0_s4_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -196,7 +196,7 @@
#define _SMODE 5
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr0_s5_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -204,7 +204,7 @@
#define _SMODE 6
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr0_s6_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -212,7 +212,7 @@
#define _SMODE 7
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti0_tr0_s7_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -223,7 +223,7 @@
#define _SMODE 0
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr0_s0_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -231,7 +231,7 @@
#define _SMODE 1
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr0_s1_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -239,7 +239,7 @@
#define _SMODE 2
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr0_s2_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -247,7 +247,7 @@
#define _SMODE 3
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr0_s3_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -255,7 +255,7 @@
#define _SMODE 4
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr0_s4_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -263,7 +263,7 @@
#define _SMODE 5
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr0_s5_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -271,7 +271,7 @@
#define _SMODE 6
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr0_s6_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -279,7 +279,7 @@
#define _SMODE 7
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti0_tr0_s7_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -290,7 +290,7 @@
#define _SMODE 0
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr0_s0_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -298,7 +298,7 @@
#define _SMODE 1
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr0_s1_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -306,7 +306,7 @@
#define _SMODE 2
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr0_s2_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -314,7 +314,7 @@
#define _SMODE 3
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr0_s3_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -322,7 +322,7 @@
#define _SMODE 4
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr0_s4_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -330,7 +330,7 @@
#define _SMODE 5
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr0_s5_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -338,7 +338,7 @@
#define _SMODE 6
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr0_s6_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -346,7 +346,7 @@
#define _SMODE 7
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti0_tr0_s7_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -356,7 +356,7 @@
#define _SMODE 0
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr0_s0_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -364,7 +364,7 @@
#define _SMODE 1
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr0_s1_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -372,7 +372,7 @@
#define _SMODE 2
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr0_s2_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -380,7 +380,7 @@
#define _SMODE 3
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr0_s3_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -388,7 +388,7 @@
#define _SMODE 4
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr0_s4_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -396,7 +396,7 @@
#define _SMODE 5
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr0_s5_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -404,7 +404,7 @@
#define _SMODE 6
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr0_s6_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -412,7 +412,7 @@
#define _SMODE 7
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti0_tr0_s7_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -422,7 +422,7 @@
#define _SMODE 0
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr0_s0_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -430,7 +430,7 @@
#define _SMODE 1
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr0_s1_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -438,7 +438,7 @@
#define _SMODE 2
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr0_s2_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -446,7 +446,7 @@
#define _SMODE 3
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr0_s3_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -454,7 +454,7 @@
#define _SMODE 4
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr0_s4_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -462,7 +462,7 @@
#define _SMODE 5
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr0_s5_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -470,7 +470,7 @@
#define _SMODE 6
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr0_s6_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -478,7 +478,7 @@
#define _SMODE 7
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti0_tr0_s7_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -489,7 +489,7 @@
#define _SMODE 0
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr0_s0_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -497,7 +497,7 @@
#define _SMODE 1
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr0_s1_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -505,7 +505,7 @@
#define _SMODE 2
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr0_s2_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -513,7 +513,7 @@
#define _SMODE 3
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr0_s3_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -521,7 +521,7 @@
#define _SMODE 4
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr0_s4_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -529,7 +529,7 @@
#define _SMODE 5
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr0_s5_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -537,7 +537,7 @@
#define _SMODE 6
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr0_s6_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -545,7 +545,7 @@
#define _SMODE 7
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti0_tr0_s7_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
diff --git a/src/devices/video/epic12_blit2.cpp b/src/devices/video/epic12_blit2.cpp
index 039ab762635..8909ca1df7e 100644
--- a/src/devices/video/epic12_blit2.cpp
+++ b/src/devices/video/epic12_blit2.cpp
@@ -12,7 +12,7 @@
/* Special Case */
#define BLENDED 0
#define FUNCNAME draw_sprite_f1_ti0_plain
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef BLENDED
@@ -22,7 +22,7 @@
#define _SMODE 0
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr1_s0_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -30,7 +30,7 @@
#define _SMODE 1
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr1_s1_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -38,7 +38,7 @@
#define _SMODE 2
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr1_s2_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -46,7 +46,7 @@
#define _SMODE 3
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr1_s3_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -54,7 +54,7 @@
#define _SMODE 4
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr1_s4_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -62,7 +62,7 @@
#define _SMODE 5
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr1_s5_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -70,7 +70,7 @@
#define _SMODE 6
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr1_s6_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -78,7 +78,7 @@
#define _SMODE 7
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr1_s7_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -89,7 +89,7 @@
#define _SMODE 0
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr1_s0_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -97,7 +97,7 @@
#define _SMODE 1
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr1_s1_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -105,7 +105,7 @@
#define _SMODE 2
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr1_s2_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -113,7 +113,7 @@
#define _SMODE 3
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr1_s3_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -121,7 +121,7 @@
#define _SMODE 4
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr1_s4_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -129,7 +129,7 @@
#define _SMODE 5
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr1_s5_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -137,7 +137,7 @@
#define _SMODE 6
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr1_s6_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -145,7 +145,7 @@
#define _SMODE 7
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr1_s7_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -156,7 +156,7 @@
#define _SMODE 0
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr1_s0_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -164,7 +164,7 @@
#define _SMODE 1
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr1_s1_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -172,7 +172,7 @@
#define _SMODE 2
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr1_s2_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -180,7 +180,7 @@
#define _SMODE 3
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr1_s3_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -188,7 +188,7 @@
#define _SMODE 4
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr1_s4_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -196,7 +196,7 @@
#define _SMODE 5
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr1_s5_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -204,7 +204,7 @@
#define _SMODE 6
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr1_s6_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -212,7 +212,7 @@
#define _SMODE 7
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr1_s7_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -223,7 +223,7 @@
#define _SMODE 0
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr1_s0_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -231,7 +231,7 @@
#define _SMODE 1
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr1_s1_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -239,7 +239,7 @@
#define _SMODE 2
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr1_s2_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -247,7 +247,7 @@
#define _SMODE 3
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr1_s3_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -255,7 +255,7 @@
#define _SMODE 4
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr1_s4_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -263,7 +263,7 @@
#define _SMODE 5
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr1_s5_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -271,7 +271,7 @@
#define _SMODE 6
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr1_s6_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -279,7 +279,7 @@
#define _SMODE 7
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr1_s7_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -290,7 +290,7 @@
#define _SMODE 0
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr1_s0_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -298,7 +298,7 @@
#define _SMODE 1
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr1_s1_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -306,7 +306,7 @@
#define _SMODE 2
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr1_s2_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -314,7 +314,7 @@
#define _SMODE 3
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr1_s3_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -322,7 +322,7 @@
#define _SMODE 4
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr1_s4_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -330,7 +330,7 @@
#define _SMODE 5
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr1_s5_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -338,7 +338,7 @@
#define _SMODE 6
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr1_s6_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -346,7 +346,7 @@
#define _SMODE 7
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr1_s7_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -356,7 +356,7 @@
#define _SMODE 0
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr1_s0_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -364,7 +364,7 @@
#define _SMODE 1
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr1_s1_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -372,7 +372,7 @@
#define _SMODE 2
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr1_s2_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -380,7 +380,7 @@
#define _SMODE 3
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr1_s3_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -388,7 +388,7 @@
#define _SMODE 4
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr1_s4_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -396,7 +396,7 @@
#define _SMODE 5
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr1_s5_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -404,7 +404,7 @@
#define _SMODE 6
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr1_s6_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -412,7 +412,7 @@
#define _SMODE 7
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr1_s7_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -422,7 +422,7 @@
#define _SMODE 0
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr1_s0_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -430,7 +430,7 @@
#define _SMODE 1
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr1_s1_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -438,7 +438,7 @@
#define _SMODE 2
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr1_s2_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -446,7 +446,7 @@
#define _SMODE 3
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr1_s3_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -454,7 +454,7 @@
#define _SMODE 4
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr1_s4_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -462,7 +462,7 @@
#define _SMODE 5
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr1_s5_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -470,7 +470,7 @@
#define _SMODE 6
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr1_s6_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -478,7 +478,7 @@
#define _SMODE 7
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr1_s7_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -489,7 +489,7 @@
#define _SMODE 0
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr1_s0_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -497,7 +497,7 @@
#define _SMODE 1
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr1_s1_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -505,7 +505,7 @@
#define _SMODE 2
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr1_s2_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -513,7 +513,7 @@
#define _SMODE 3
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr1_s3_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -521,7 +521,7 @@
#define _SMODE 4
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr1_s4_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -529,7 +529,7 @@
#define _SMODE 5
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr1_s5_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -537,7 +537,7 @@
#define _SMODE 6
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr1_s6_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -545,7 +545,7 @@
#define _SMODE 7
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr1_s7_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
diff --git a/src/devices/video/epic12_blit3.cpp b/src/devices/video/epic12_blit3.cpp
index 868f4c1e25e..7bc6b7ca44a 100644
--- a/src/devices/video/epic12_blit3.cpp
+++ b/src/devices/video/epic12_blit3.cpp
@@ -12,7 +12,7 @@
/* Special Case */
#define BLENDED 0
#define FUNCNAME draw_sprite_f1_ti0_tr0_plain
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef BLENDED
@@ -22,7 +22,7 @@
#define _SMODE 0
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr0_s0_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -30,7 +30,7 @@
#define _SMODE 1
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr0_s1_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -38,7 +38,7 @@
#define _SMODE 2
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr0_s2_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -46,7 +46,7 @@
#define _SMODE 3
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr0_s3_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -54,7 +54,7 @@
#define _SMODE 4
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr0_s4_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -62,7 +62,7 @@
#define _SMODE 5
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr0_s5_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -70,7 +70,7 @@
#define _SMODE 6
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr0_s6_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -78,7 +78,7 @@
#define _SMODE 7
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti0_tr0_s7_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -89,7 +89,7 @@
#define _SMODE 0
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr0_s0_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -97,7 +97,7 @@
#define _SMODE 1
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr0_s1_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -105,7 +105,7 @@
#define _SMODE 2
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr0_s2_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -113,7 +113,7 @@
#define _SMODE 3
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr0_s3_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -121,7 +121,7 @@
#define _SMODE 4
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr0_s4_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -129,7 +129,7 @@
#define _SMODE 5
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr0_s5_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -137,7 +137,7 @@
#define _SMODE 6
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr0_s6_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -145,7 +145,7 @@
#define _SMODE 7
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti0_tr0_s7_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -156,7 +156,7 @@
#define _SMODE 0
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr0_s0_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -164,7 +164,7 @@
#define _SMODE 1
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr0_s1_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -172,7 +172,7 @@
#define _SMODE 2
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr0_s2_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -180,7 +180,7 @@
#define _SMODE 3
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr0_s3_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -188,7 +188,7 @@
#define _SMODE 4
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr0_s4_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -196,7 +196,7 @@
#define _SMODE 5
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr0_s5_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -204,7 +204,7 @@
#define _SMODE 6
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr0_s6_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -212,7 +212,7 @@
#define _SMODE 7
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti0_tr0_s7_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -223,7 +223,7 @@
#define _SMODE 0
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr0_s0_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -231,7 +231,7 @@
#define _SMODE 1
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr0_s1_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -239,7 +239,7 @@
#define _SMODE 2
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr0_s2_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -247,7 +247,7 @@
#define _SMODE 3
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr0_s3_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -255,7 +255,7 @@
#define _SMODE 4
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr0_s4_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -263,7 +263,7 @@
#define _SMODE 5
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr0_s5_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -271,7 +271,7 @@
#define _SMODE 6
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr0_s6_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -279,7 +279,7 @@
#define _SMODE 7
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti0_tr0_s7_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -290,7 +290,7 @@
#define _SMODE 0
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr0_s0_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -298,7 +298,7 @@
#define _SMODE 1
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr0_s1_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -306,7 +306,7 @@
#define _SMODE 2
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr0_s2_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -314,7 +314,7 @@
#define _SMODE 3
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr0_s3_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -322,7 +322,7 @@
#define _SMODE 4
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr0_s4_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -330,7 +330,7 @@
#define _SMODE 5
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr0_s5_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -338,7 +338,7 @@
#define _SMODE 6
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr0_s6_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -346,7 +346,7 @@
#define _SMODE 7
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti0_tr0_s7_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -356,7 +356,7 @@
#define _SMODE 0
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr0_s0_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -364,7 +364,7 @@
#define _SMODE 1
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr0_s1_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -372,7 +372,7 @@
#define _SMODE 2
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr0_s2_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -380,7 +380,7 @@
#define _SMODE 3
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr0_s3_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -388,7 +388,7 @@
#define _SMODE 4
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr0_s4_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -396,7 +396,7 @@
#define _SMODE 5
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr0_s5_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -404,7 +404,7 @@
#define _SMODE 6
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr0_s6_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -412,7 +412,7 @@
#define _SMODE 7
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti0_tr0_s7_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -422,7 +422,7 @@
#define _SMODE 0
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr0_s0_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -430,7 +430,7 @@
#define _SMODE 1
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr0_s1_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -438,7 +438,7 @@
#define _SMODE 2
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr0_s2_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -446,7 +446,7 @@
#define _SMODE 3
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr0_s3_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -454,7 +454,7 @@
#define _SMODE 4
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr0_s4_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -462,7 +462,7 @@
#define _SMODE 5
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr0_s5_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -470,7 +470,7 @@
#define _SMODE 6
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr0_s6_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -478,7 +478,7 @@
#define _SMODE 7
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti0_tr0_s7_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -489,7 +489,7 @@
#define _SMODE 0
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr0_s0_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -497,7 +497,7 @@
#define _SMODE 1
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr0_s1_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -505,7 +505,7 @@
#define _SMODE 2
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr0_s2_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -513,7 +513,7 @@
#define _SMODE 3
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr0_s3_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -521,7 +521,7 @@
#define _SMODE 4
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr0_s4_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -529,7 +529,7 @@
#define _SMODE 5
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr0_s5_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -537,7 +537,7 @@
#define _SMODE 6
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr0_s6_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -545,7 +545,7 @@
#define _SMODE 7
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti0_tr0_s7_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
diff --git a/src/devices/video/epic12_blit4.cpp b/src/devices/video/epic12_blit4.cpp
index c5ed93ae70b..06dec67898c 100644
--- a/src/devices/video/epic12_blit4.cpp
+++ b/src/devices/video/epic12_blit4.cpp
@@ -12,7 +12,7 @@
/* Special Case */
#define BLENDED 0
#define FUNCNAME draw_sprite_f0_ti1_tr1_plain
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef BLENDED
@@ -22,7 +22,7 @@
#define _SMODE 0
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr1_s0_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -30,7 +30,7 @@
#define _SMODE 1
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr1_s1_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -38,7 +38,7 @@
#define _SMODE 2
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr1_s2_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -46,7 +46,7 @@
#define _SMODE 3
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr1_s3_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -54,7 +54,7 @@
#define _SMODE 4
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr1_s4_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -62,7 +62,7 @@
#define _SMODE 5
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr1_s5_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -70,7 +70,7 @@
#define _SMODE 6
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr1_s6_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -78,7 +78,7 @@
#define _SMODE 7
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr1_s7_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -89,7 +89,7 @@
#define _SMODE 0
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr1_s0_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -97,7 +97,7 @@
#define _SMODE 1
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr1_s1_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -105,7 +105,7 @@
#define _SMODE 2
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr1_s2_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -113,7 +113,7 @@
#define _SMODE 3
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr1_s3_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -121,7 +121,7 @@
#define _SMODE 4
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr1_s4_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -129,7 +129,7 @@
#define _SMODE 5
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr1_s5_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -137,7 +137,7 @@
#define _SMODE 6
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr1_s6_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -145,7 +145,7 @@
#define _SMODE 7
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr1_s7_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -156,7 +156,7 @@
#define _SMODE 0
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr1_s0_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -164,7 +164,7 @@
#define _SMODE 1
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr1_s1_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -172,7 +172,7 @@
#define _SMODE 2
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr1_s2_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -180,7 +180,7 @@
#define _SMODE 3
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr1_s3_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -188,7 +188,7 @@
#define _SMODE 4
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr1_s4_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -196,7 +196,7 @@
#define _SMODE 5
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr1_s5_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -204,7 +204,7 @@
#define _SMODE 6
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr1_s6_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -212,7 +212,7 @@
#define _SMODE 7
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr1_s7_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -223,7 +223,7 @@
#define _SMODE 0
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr1_s0_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -231,7 +231,7 @@
#define _SMODE 1
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr1_s1_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -239,7 +239,7 @@
#define _SMODE 2
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr1_s2_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -247,7 +247,7 @@
#define _SMODE 3
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr1_s3_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -255,7 +255,7 @@
#define _SMODE 4
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr1_s4_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -263,7 +263,7 @@
#define _SMODE 5
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr1_s5_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -271,7 +271,7 @@
#define _SMODE 6
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr1_s6_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -279,7 +279,7 @@
#define _SMODE 7
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr1_s7_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -290,7 +290,7 @@
#define _SMODE 0
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr1_s0_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -298,7 +298,7 @@
#define _SMODE 1
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr1_s1_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -306,7 +306,7 @@
#define _SMODE 2
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr1_s2_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -314,7 +314,7 @@
#define _SMODE 3
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr1_s3_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -322,7 +322,7 @@
#define _SMODE 4
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr1_s4_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -330,7 +330,7 @@
#define _SMODE 5
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr1_s5_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -338,7 +338,7 @@
#define _SMODE 6
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr1_s6_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -346,7 +346,7 @@
#define _SMODE 7
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr1_s7_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -356,7 +356,7 @@
#define _SMODE 0
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr1_s0_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -364,7 +364,7 @@
#define _SMODE 1
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr1_s1_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -372,7 +372,7 @@
#define _SMODE 2
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr1_s2_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -380,7 +380,7 @@
#define _SMODE 3
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr1_s3_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -388,7 +388,7 @@
#define _SMODE 4
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr1_s4_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -396,7 +396,7 @@
#define _SMODE 5
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr1_s5_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -404,7 +404,7 @@
#define _SMODE 6
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr1_s6_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -412,7 +412,7 @@
#define _SMODE 7
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr1_s7_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -422,7 +422,7 @@
#define _SMODE 0
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr1_s0_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -430,7 +430,7 @@
#define _SMODE 1
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr1_s1_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -438,7 +438,7 @@
#define _SMODE 2
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr1_s2_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -446,7 +446,7 @@
#define _SMODE 3
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr1_s3_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -454,7 +454,7 @@
#define _SMODE 4
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr1_s4_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -462,7 +462,7 @@
#define _SMODE 5
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr1_s5_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -470,7 +470,7 @@
#define _SMODE 6
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr1_s6_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -478,7 +478,7 @@
#define _SMODE 7
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr1_s7_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -489,7 +489,7 @@
#define _SMODE 0
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr1_s0_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -497,7 +497,7 @@
#define _SMODE 1
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr1_s1_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -505,7 +505,7 @@
#define _SMODE 2
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr1_s2_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -513,7 +513,7 @@
#define _SMODE 3
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr1_s3_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -521,7 +521,7 @@
#define _SMODE 4
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr1_s4_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -529,7 +529,7 @@
#define _SMODE 5
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr1_s5_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -537,7 +537,7 @@
#define _SMODE 6
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr1_s6_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -545,7 +545,7 @@
#define _SMODE 7
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr1_s7_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
diff --git a/src/devices/video/epic12_blit5.cpp b/src/devices/video/epic12_blit5.cpp
index 4c0a3b0bd0d..9520abb64e9 100644
--- a/src/devices/video/epic12_blit5.cpp
+++ b/src/devices/video/epic12_blit5.cpp
@@ -12,7 +12,7 @@
/* Special Case */
#define BLENDED 0
#define FUNCNAME draw_sprite_f0_ti1_tr0_plain
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef BLENDED
@@ -22,7 +22,7 @@
#define _SMODE 0
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr0_s0_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -30,7 +30,7 @@
#define _SMODE 1
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr0_s1_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -38,7 +38,7 @@
#define _SMODE 2
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr0_s2_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -46,7 +46,7 @@
#define _SMODE 3
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr0_s3_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -54,7 +54,7 @@
#define _SMODE 4
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr0_s4_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -62,7 +62,7 @@
#define _SMODE 5
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr0_s5_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -70,7 +70,7 @@
#define _SMODE 6
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr0_s6_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -78,7 +78,7 @@
#define _SMODE 7
#define _DMODE 0
#define FUNCNAME draw_sprite_f0_ti1_tr0_s7_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -89,7 +89,7 @@
#define _SMODE 0
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr0_s0_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -97,7 +97,7 @@
#define _SMODE 1
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr0_s1_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -105,7 +105,7 @@
#define _SMODE 2
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr0_s2_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -113,7 +113,7 @@
#define _SMODE 3
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr0_s3_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -121,7 +121,7 @@
#define _SMODE 4
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr0_s4_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -129,7 +129,7 @@
#define _SMODE 5
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr0_s5_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -137,7 +137,7 @@
#define _SMODE 6
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr0_s6_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -145,7 +145,7 @@
#define _SMODE 7
#define _DMODE 1
#define FUNCNAME draw_sprite_f0_ti1_tr0_s7_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -156,7 +156,7 @@
#define _SMODE 0
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr0_s0_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -164,7 +164,7 @@
#define _SMODE 1
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr0_s1_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -172,7 +172,7 @@
#define _SMODE 2
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr0_s2_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -180,7 +180,7 @@
#define _SMODE 3
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr0_s3_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -188,7 +188,7 @@
#define _SMODE 4
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr0_s4_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -196,7 +196,7 @@
#define _SMODE 5
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr0_s5_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -204,7 +204,7 @@
#define _SMODE 6
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr0_s6_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -212,7 +212,7 @@
#define _SMODE 7
#define _DMODE 2
#define FUNCNAME draw_sprite_f0_ti1_tr0_s7_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -223,7 +223,7 @@
#define _SMODE 0
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr0_s0_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -231,7 +231,7 @@
#define _SMODE 1
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr0_s1_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -239,7 +239,7 @@
#define _SMODE 2
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr0_s2_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -247,7 +247,7 @@
#define _SMODE 3
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr0_s3_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -255,7 +255,7 @@
#define _SMODE 4
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr0_s4_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -263,7 +263,7 @@
#define _SMODE 5
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr0_s5_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -271,7 +271,7 @@
#define _SMODE 6
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr0_s6_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -279,7 +279,7 @@
#define _SMODE 7
#define _DMODE 3
#define FUNCNAME draw_sprite_f0_ti1_tr0_s7_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -290,7 +290,7 @@
#define _SMODE 0
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr0_s0_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -298,7 +298,7 @@
#define _SMODE 1
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr0_s1_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -306,7 +306,7 @@
#define _SMODE 2
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr0_s2_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -314,7 +314,7 @@
#define _SMODE 3
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr0_s3_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -322,7 +322,7 @@
#define _SMODE 4
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr0_s4_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -330,7 +330,7 @@
#define _SMODE 5
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr0_s5_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -338,7 +338,7 @@
#define _SMODE 6
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr0_s6_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -346,7 +346,7 @@
#define _SMODE 7
#define _DMODE 4
#define FUNCNAME draw_sprite_f0_ti1_tr0_s7_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -356,7 +356,7 @@
#define _SMODE 0
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr0_s0_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -364,7 +364,7 @@
#define _SMODE 1
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr0_s1_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -372,7 +372,7 @@
#define _SMODE 2
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr0_s2_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -380,7 +380,7 @@
#define _SMODE 3
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr0_s3_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -388,7 +388,7 @@
#define _SMODE 4
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr0_s4_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -396,7 +396,7 @@
#define _SMODE 5
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr0_s5_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -404,7 +404,7 @@
#define _SMODE 6
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr0_s6_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -412,7 +412,7 @@
#define _SMODE 7
#define _DMODE 5
#define FUNCNAME draw_sprite_f0_ti1_tr0_s7_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -422,7 +422,7 @@
#define _SMODE 0
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr0_s0_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -430,7 +430,7 @@
#define _SMODE 1
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr0_s1_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -438,7 +438,7 @@
#define _SMODE 2
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr0_s2_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -446,7 +446,7 @@
#define _SMODE 3
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr0_s3_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -454,7 +454,7 @@
#define _SMODE 4
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr0_s4_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -462,7 +462,7 @@
#define _SMODE 5
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr0_s5_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -470,7 +470,7 @@
#define _SMODE 6
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr0_s6_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -478,7 +478,7 @@
#define _SMODE 7
#define _DMODE 6
#define FUNCNAME draw_sprite_f0_ti1_tr0_s7_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -489,7 +489,7 @@
#define _SMODE 0
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr0_s0_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -497,7 +497,7 @@
#define _SMODE 1
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr0_s1_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -505,7 +505,7 @@
#define _SMODE 2
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr0_s2_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -513,7 +513,7 @@
#define _SMODE 3
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr0_s3_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -521,7 +521,7 @@
#define _SMODE 4
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr0_s4_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -529,7 +529,7 @@
#define _SMODE 5
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr0_s5_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -537,7 +537,7 @@
#define _SMODE 6
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr0_s6_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -545,7 +545,7 @@
#define _SMODE 7
#define _DMODE 7
#define FUNCNAME draw_sprite_f0_ti1_tr0_s7_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
diff --git a/src/devices/video/epic12_blit6.cpp b/src/devices/video/epic12_blit6.cpp
index 9ef7302b139..3cdcf2f4b9a 100644
--- a/src/devices/video/epic12_blit6.cpp
+++ b/src/devices/video/epic12_blit6.cpp
@@ -12,7 +12,7 @@
/* Special Case */
#define BLENDED 0
#define FUNCNAME draw_sprite_f1_ti1_tr1_plain
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef BLENDED
@@ -22,7 +22,7 @@
#define _SMODE 0
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr1_s0_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -30,7 +30,7 @@
#define _SMODE 1
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr1_s1_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -38,7 +38,7 @@
#define _SMODE 2
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr1_s2_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -46,7 +46,7 @@
#define _SMODE 3
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr1_s3_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -54,7 +54,7 @@
#define _SMODE 4
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr1_s4_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -62,7 +62,7 @@
#define _SMODE 5
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr1_s5_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -70,7 +70,7 @@
#define _SMODE 6
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr1_s6_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -78,7 +78,7 @@
#define _SMODE 7
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr1_s7_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -89,7 +89,7 @@
#define _SMODE 0
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr1_s0_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -97,7 +97,7 @@
#define _SMODE 1
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr1_s1_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -105,7 +105,7 @@
#define _SMODE 2
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr1_s2_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -113,7 +113,7 @@
#define _SMODE 3
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr1_s3_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -121,7 +121,7 @@
#define _SMODE 4
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr1_s4_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -129,7 +129,7 @@
#define _SMODE 5
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr1_s5_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -137,7 +137,7 @@
#define _SMODE 6
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr1_s6_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -145,7 +145,7 @@
#define _SMODE 7
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr1_s7_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -156,7 +156,7 @@
#define _SMODE 0
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr1_s0_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -164,7 +164,7 @@
#define _SMODE 1
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr1_s1_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -172,7 +172,7 @@
#define _SMODE 2
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr1_s2_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -180,7 +180,7 @@
#define _SMODE 3
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr1_s3_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -188,7 +188,7 @@
#define _SMODE 4
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr1_s4_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -196,7 +196,7 @@
#define _SMODE 5
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr1_s5_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -204,7 +204,7 @@
#define _SMODE 6
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr1_s6_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -212,7 +212,7 @@
#define _SMODE 7
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr1_s7_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -223,7 +223,7 @@
#define _SMODE 0
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr1_s0_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -231,7 +231,7 @@
#define _SMODE 1
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr1_s1_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -239,7 +239,7 @@
#define _SMODE 2
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr1_s2_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -247,7 +247,7 @@
#define _SMODE 3
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr1_s3_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -255,7 +255,7 @@
#define _SMODE 4
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr1_s4_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -263,7 +263,7 @@
#define _SMODE 5
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr1_s5_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -271,7 +271,7 @@
#define _SMODE 6
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr1_s6_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -279,7 +279,7 @@
#define _SMODE 7
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr1_s7_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -290,7 +290,7 @@
#define _SMODE 0
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr1_s0_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -298,7 +298,7 @@
#define _SMODE 1
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr1_s1_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -306,7 +306,7 @@
#define _SMODE 2
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr1_s2_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -314,7 +314,7 @@
#define _SMODE 3
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr1_s3_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -322,7 +322,7 @@
#define _SMODE 4
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr1_s4_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -330,7 +330,7 @@
#define _SMODE 5
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr1_s5_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -338,7 +338,7 @@
#define _SMODE 6
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr1_s6_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -346,7 +346,7 @@
#define _SMODE 7
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr1_s7_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -356,7 +356,7 @@
#define _SMODE 0
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr1_s0_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -364,7 +364,7 @@
#define _SMODE 1
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr1_s1_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -372,7 +372,7 @@
#define _SMODE 2
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr1_s2_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -380,7 +380,7 @@
#define _SMODE 3
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr1_s3_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -388,7 +388,7 @@
#define _SMODE 4
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr1_s4_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -396,7 +396,7 @@
#define _SMODE 5
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr1_s5_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -404,7 +404,7 @@
#define _SMODE 6
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr1_s6_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -412,7 +412,7 @@
#define _SMODE 7
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr1_s7_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -422,7 +422,7 @@
#define _SMODE 0
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr1_s0_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -430,7 +430,7 @@
#define _SMODE 1
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr1_s1_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -438,7 +438,7 @@
#define _SMODE 2
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr1_s2_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -446,7 +446,7 @@
#define _SMODE 3
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr1_s3_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -454,7 +454,7 @@
#define _SMODE 4
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr1_s4_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -462,7 +462,7 @@
#define _SMODE 5
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr1_s5_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -470,7 +470,7 @@
#define _SMODE 6
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr1_s6_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -478,7 +478,7 @@
#define _SMODE 7
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr1_s7_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -489,7 +489,7 @@
#define _SMODE 0
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr1_s0_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -497,7 +497,7 @@
#define _SMODE 1
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr1_s1_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -505,7 +505,7 @@
#define _SMODE 2
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr1_s2_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -513,7 +513,7 @@
#define _SMODE 3
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr1_s3_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -521,7 +521,7 @@
#define _SMODE 4
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr1_s4_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -529,7 +529,7 @@
#define _SMODE 5
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr1_s5_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -537,7 +537,7 @@
#define _SMODE 6
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr1_s6_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -545,7 +545,7 @@
#define _SMODE 7
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr1_s7_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
diff --git a/src/devices/video/epic12_blit7.cpp b/src/devices/video/epic12_blit7.cpp
index 6ab5366a721..480f85011dd 100644
--- a/src/devices/video/epic12_blit7.cpp
+++ b/src/devices/video/epic12_blit7.cpp
@@ -12,7 +12,7 @@
/* Special Case */
#define BLENDED 0
#define FUNCNAME draw_sprite_f1_ti1_tr0_plain
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef BLENDED
@@ -22,7 +22,7 @@
#define _SMODE 0
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr0_s0_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -30,7 +30,7 @@
#define _SMODE 1
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr0_s1_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -38,7 +38,7 @@
#define _SMODE 2
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr0_s2_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -46,7 +46,7 @@
#define _SMODE 3
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr0_s3_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -54,7 +54,7 @@
#define _SMODE 4
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr0_s4_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -62,7 +62,7 @@
#define _SMODE 5
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr0_s5_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -70,7 +70,7 @@
#define _SMODE 6
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr0_s6_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -78,7 +78,7 @@
#define _SMODE 7
#define _DMODE 0
#define FUNCNAME draw_sprite_f1_ti1_tr0_s7_d0
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -89,7 +89,7 @@
#define _SMODE 0
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr0_s0_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -97,7 +97,7 @@
#define _SMODE 1
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr0_s1_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -105,7 +105,7 @@
#define _SMODE 2
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr0_s2_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -113,7 +113,7 @@
#define _SMODE 3
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr0_s3_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -121,7 +121,7 @@
#define _SMODE 4
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr0_s4_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -129,7 +129,7 @@
#define _SMODE 5
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr0_s5_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -137,7 +137,7 @@
#define _SMODE 6
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr0_s6_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -145,7 +145,7 @@
#define _SMODE 7
#define _DMODE 1
#define FUNCNAME draw_sprite_f1_ti1_tr0_s7_d1
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -156,7 +156,7 @@
#define _SMODE 0
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr0_s0_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -164,7 +164,7 @@
#define _SMODE 1
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr0_s1_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -172,7 +172,7 @@
#define _SMODE 2
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr0_s2_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -180,7 +180,7 @@
#define _SMODE 3
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr0_s3_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -188,7 +188,7 @@
#define _SMODE 4
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr0_s4_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -196,7 +196,7 @@
#define _SMODE 5
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr0_s5_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -204,7 +204,7 @@
#define _SMODE 6
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr0_s6_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -212,7 +212,7 @@
#define _SMODE 7
#define _DMODE 2
#define FUNCNAME draw_sprite_f1_ti1_tr0_s7_d2
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -223,7 +223,7 @@
#define _SMODE 0
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr0_s0_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -231,7 +231,7 @@
#define _SMODE 1
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr0_s1_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -239,7 +239,7 @@
#define _SMODE 2
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr0_s2_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -247,7 +247,7 @@
#define _SMODE 3
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr0_s3_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -255,7 +255,7 @@
#define _SMODE 4
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr0_s4_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -263,7 +263,7 @@
#define _SMODE 5
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr0_s5_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -271,7 +271,7 @@
#define _SMODE 6
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr0_s6_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -279,7 +279,7 @@
#define _SMODE 7
#define _DMODE 3
#define FUNCNAME draw_sprite_f1_ti1_tr0_s7_d3
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -290,7 +290,7 @@
#define _SMODE 0
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr0_s0_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -298,7 +298,7 @@
#define _SMODE 1
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr0_s1_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -306,7 +306,7 @@
#define _SMODE 2
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr0_s2_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -314,7 +314,7 @@
#define _SMODE 3
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr0_s3_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -322,7 +322,7 @@
#define _SMODE 4
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr0_s4_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -330,7 +330,7 @@
#define _SMODE 5
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr0_s5_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -338,7 +338,7 @@
#define _SMODE 6
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr0_s6_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -346,7 +346,7 @@
#define _SMODE 7
#define _DMODE 4
#define FUNCNAME draw_sprite_f1_ti1_tr0_s7_d4
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -356,7 +356,7 @@
#define _SMODE 0
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr0_s0_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -364,7 +364,7 @@
#define _SMODE 1
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr0_s1_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -372,7 +372,7 @@
#define _SMODE 2
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr0_s2_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -380,7 +380,7 @@
#define _SMODE 3
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr0_s3_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -388,7 +388,7 @@
#define _SMODE 4
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr0_s4_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -396,7 +396,7 @@
#define _SMODE 5
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr0_s5_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -404,7 +404,7 @@
#define _SMODE 6
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr0_s6_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -412,7 +412,7 @@
#define _SMODE 7
#define _DMODE 5
#define FUNCNAME draw_sprite_f1_ti1_tr0_s7_d5
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -422,7 +422,7 @@
#define _SMODE 0
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr0_s0_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -430,7 +430,7 @@
#define _SMODE 1
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr0_s1_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -438,7 +438,7 @@
#define _SMODE 2
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr0_s2_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -446,7 +446,7 @@
#define _SMODE 3
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr0_s3_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -454,7 +454,7 @@
#define _SMODE 4
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr0_s4_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -462,7 +462,7 @@
#define _SMODE 5
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr0_s5_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -470,7 +470,7 @@
#define _SMODE 6
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr0_s6_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -478,7 +478,7 @@
#define _SMODE 7
#define _DMODE 6
#define FUNCNAME draw_sprite_f1_ti1_tr0_s7_d6
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -489,7 +489,7 @@
#define _SMODE 0
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr0_s0_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -497,7 +497,7 @@
#define _SMODE 1
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr0_s1_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -505,7 +505,7 @@
#define _SMODE 2
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr0_s2_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -513,7 +513,7 @@
#define _SMODE 3
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr0_s3_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -521,7 +521,7 @@
#define _SMODE 4
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr0_s4_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -529,7 +529,7 @@
#define _SMODE 5
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr0_s5_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -537,7 +537,7 @@
#define _SMODE 6
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr0_s6_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
@@ -545,7 +545,7 @@
#define _SMODE 7
#define _DMODE 7
#define FUNCNAME draw_sprite_f1_ti1_tr0_s7_d7
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef _SMODE
#undef _DMODE
diff --git a/src/devices/video/epic12_blit8.cpp b/src/devices/video/epic12_blit8.cpp
index fb9cc763395..fb0ff8a7e24 100644
--- a/src/devices/video/epic12_blit8.cpp
+++ b/src/devices/video/epic12_blit8.cpp
@@ -12,13 +12,13 @@
#define TRANSPARENT 1
#define FLIPX 0
#define FUNCNAME draw_sprite_f0_ti0_tr1_simple
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef FLIPX
#define FLIPX 1
#define FUNCNAME draw_sprite_f1_ti0_tr1_simple
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef FLIPX
#undef TRANSPARENT
@@ -27,13 +27,13 @@
#define TRANSPARENT 0
#define FLIPX 0
#define FUNCNAME draw_sprite_f0_ti0_tr0_simple
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef FLIPX
#define FLIPX 1
#define FUNCNAME draw_sprite_f1_ti0_tr0_simple
-#include "epic12in.inc"
+#include "epic12in.hxx"
#undef FUNCNAME
#undef FLIPX
#undef TRANSPARENT
diff --git a/src/devices/video/epic12in.inc b/src/devices/video/epic12in.hxx
index 4297c5a2d55..8bb6beb97f4 100644
--- a/src/devices/video/epic12in.inc
+++ b/src/devices/video/epic12in.hxx
@@ -143,21 +143,21 @@ void epic12_device::FUNCNAME(BLIT_PARAMS)
while (bigblocks)
{
- #include "epic12pixel.inc"
- #include "epic12pixel.inc"
- #include "epic12pixel.inc"
- #include "epic12pixel.inc"
- #include "epic12pixel.inc"
- #include "epic12pixel.inc"
- #include "epic12pixel.inc"
- #include "epic12pixel.inc"
+ #include "epic12pixel.hxx"
+ #include "epic12pixel.hxx"
+ #include "epic12pixel.hxx"
+ #include "epic12pixel.hxx"
+ #include "epic12pixel.hxx"
+ #include "epic12pixel.hxx"
+ #include "epic12pixel.hxx"
+ #include "epic12pixel.hxx"
bigblocks--;
}
#endif
while (bmp<end)
{
- #include "epic12pixel.inc"
+ #include "epic12pixel.hxx"
}
}
diff --git a/src/devices/video/epic12pixel.inc b/src/devices/video/epic12pixel.hxx
index 65666470e40..65666470e40 100644
--- a/src/devices/video/epic12pixel.inc
+++ b/src/devices/video/epic12pixel.hxx
diff --git a/src/devices/video/voodoo.cpp b/src/devices/video/voodoo.cpp
index 98ea123f55b..4b74d1dbdf9 100644
--- a/src/devices/video/voodoo.cpp
+++ b/src/devices/video/voodoo.cpp
@@ -205,7 +205,7 @@ UINT32 voodoo_reciplog[(2 << RECIPLOG_LOOKUP_BITS) + 2];
#define RASTERIZER_ENTRY(fbzcp, alpha, fog, fbz, tex0, tex1) \
RASTERIZER(fbzcp##_##alpha##_##fog##_##fbz##_##tex0##_##tex1, (((tex0) == 0xffffffff) ? 0 : ((tex1) == 0xffffffff) ? 1 : 2), fbzcp, fbz, alpha, fog, tex0, tex1)
-#include "voodoo_rast.inc"
+#include "voodoo_rast.hxx"
#undef RASTERIZER_ENTRY
@@ -222,7 +222,7 @@ UINT32 voodoo_reciplog[(2 << RECIPLOG_LOOKUP_BITS) + 2];
static const raster_info predef_raster_table[] =
{
-#include "voodoo_rast.inc"
+#include "voodoo_rast.hxx"
{ nullptr }
};
diff --git a/src/devices/video/voodoo.h b/src/devices/video/voodoo.h
index 81951a17087..32fde66b902 100644
--- a/src/devices/video/voodoo.h
+++ b/src/devices/video/voodoo.h
@@ -1829,7 +1829,7 @@ public:
static void raster_##name(void *destbase, INT32 y, const poly_extent *extent, const void *extradata, int threadid);
#define RASTERIZER_ENTRY(fbzcp, alpha, fog, fbz, tex0, tex1) \
RASTERIZER_HEADER(fbzcp##_##alpha##_##fog##_##fbz##_##tex0##_##tex1)
-#include "voodoo_rast.inc"
+#include "voodoo_rast.hxx"
#undef RASTERIZER_ENTRY
diff --git a/src/devices/video/voodoo_rast.inc b/src/devices/video/voodoo_rast.hxx
index 4c858bc1e69..4c858bc1e69 100644
--- a/src/devices/video/voodoo_rast.inc
+++ b/src/devices/video/voodoo_rast.hxx
diff --git a/src/emu/rendersw.inc b/src/emu/rendersw.hxx
index a7dcbac0191..a7dcbac0191 100644
--- a/src/emu/rendersw.inc
+++ b/src/emu/rendersw.hxx
diff --git a/src/emu/video.cpp b/src/emu/video.cpp
index 8ff9207f99f..a12afe03687 100644
--- a/src/emu/video.cpp
+++ b/src/emu/video.cpp
@@ -15,7 +15,7 @@
#include "ui/uimain.h"
#include "aviio.h"
#include "crsshair.h"
-#include "rendersw.inc"
+#include "rendersw.hxx"
#include "output.h"
#include "snap.lh"
diff --git a/src/mame/drivers/bfm_ad5.cpp b/src/mame/drivers/bfm_ad5.cpp
index bb3a8028373..3374a24c2c1 100644
--- a/src/mame/drivers/bfm_ad5.cpp
+++ b/src/mame/drivers/bfm_ad5.cpp
@@ -86,4 +86,4 @@ MACHINE_CONFIG_START( bfm_ad5, adder5_state )
/* unknown sound */
MACHINE_CONFIG_END
-#include "bfm_ad5sw.inc" \ No newline at end of file
+#include "bfm_ad5sw.hxx" \ No newline at end of file
diff --git a/src/mame/drivers/bfm_ad5sw.inc b/src/mame/drivers/bfm_ad5sw.hxx
index 12ebc062a3e..12ebc062a3e 100644
--- a/src/mame/drivers/bfm_ad5sw.inc
+++ b/src/mame/drivers/bfm_ad5sw.hxx
diff --git a/src/mame/drivers/bfm_sc5.cpp b/src/mame/drivers/bfm_sc5.cpp
index 1d02cbc4428..a899ee2260e 100644
--- a/src/mame/drivers/bfm_sc5.cpp
+++ b/src/mame/drivers/bfm_sc5.cpp
@@ -232,4 +232,4 @@ MACHINE_CONFIG_START( bfm_sc5, bfm_sc5_state )
MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 1.0)
MACHINE_CONFIG_END
-#include "bfm_sc5sw.inc"
+#include "bfm_sc5sw.hxx"
diff --git a/src/mame/drivers/bfm_sc5sw.inc b/src/mame/drivers/bfm_sc5sw.hxx
index 408613a88b6..408613a88b6 100644
--- a/src/mame/drivers/bfm_sc5sw.inc
+++ b/src/mame/drivers/bfm_sc5sw.hxx
diff --git a/src/mame/drivers/maygay1b.cpp b/src/mame/drivers/maygay1b.cpp
index d644d78c63f..26c976c4eee 100644
--- a/src/mame/drivers/maygay1b.cpp
+++ b/src/mame/drivers/maygay1b.cpp
@@ -714,4 +714,4 @@ DRIVER_INIT_MEMBER(maygay1b_state,m1)
}
}
-#include "maygay1b.inc"
+#include "maygay1b.hxx"
diff --git a/src/mame/drivers/maygay1b.inc b/src/mame/drivers/maygay1b.hxx
index 7fede8ddd29..7fede8ddd29 100644
--- a/src/mame/drivers/maygay1b.inc
+++ b/src/mame/drivers/maygay1b.hxx
diff --git a/src/mame/drivers/mpu4.cpp b/src/mame/drivers/mpu4.cpp
index 025b6bb5f98..1a77ccec16a 100644
--- a/src/mame/drivers/mpu4.cpp
+++ b/src/mame/drivers/mpu4.cpp
@@ -2758,15 +2758,15 @@ MACHINE_CONFIG_END
#define GAME_FLAGS (MACHINE_NOT_WORKING|MACHINE_REQUIRES_ARTWORK|MACHINE_MECHANICAL)
-#include "mpu4.inc"
-#include "mpu4avan.inc"
-#include "mpu4bwb.inc"
-#include "mpu4concept.inc"
-#include "mpu4crystal.inc"
-#include "mpu4empire.inc"
-#include "mpu4mdm.inc"
-#include "mpu4misc.inc"
-#include "mpu4mod2sw.inc"
-#include "mpu4mod4yam.inc"
-#include "mpu4sw.inc"
-#include "mpu4union.inc"
+#include "mpu4.hxx"
+#include "mpu4avan.hxx"
+#include "mpu4bwb.hxx"
+#include "mpu4concept.hxx"
+#include "mpu4crystal.hxx"
+#include "mpu4empire.hxx"
+#include "mpu4mdm.hxx"
+#include "mpu4misc.hxx"
+#include "mpu4mod2sw.hxx"
+#include "mpu4mod4yam.hxx"
+#include "mpu4sw.hxx"
+#include "mpu4union.hxx"
diff --git a/src/mame/drivers/mpu4.inc b/src/mame/drivers/mpu4.hxx
index 59cfa8cc00c..59cfa8cc00c 100644
--- a/src/mame/drivers/mpu4.inc
+++ b/src/mame/drivers/mpu4.hxx
diff --git a/src/mame/drivers/mpu4avan.inc b/src/mame/drivers/mpu4avan.hxx
index a1cba524141..a1cba524141 100644
--- a/src/mame/drivers/mpu4avan.inc
+++ b/src/mame/drivers/mpu4avan.hxx
diff --git a/src/mame/drivers/mpu4bwb.inc b/src/mame/drivers/mpu4bwb.hxx
index 11caa86c32e..11caa86c32e 100644
--- a/src/mame/drivers/mpu4bwb.inc
+++ b/src/mame/drivers/mpu4bwb.hxx
diff --git a/src/mame/drivers/mpu4concept.inc b/src/mame/drivers/mpu4concept.hxx
index 0b26e132cec..0b26e132cec 100644
--- a/src/mame/drivers/mpu4concept.inc
+++ b/src/mame/drivers/mpu4concept.hxx
diff --git a/src/mame/drivers/mpu4crystal.inc b/src/mame/drivers/mpu4crystal.hxx
index e3b9eda1f34..e3b9eda1f34 100644
--- a/src/mame/drivers/mpu4crystal.inc
+++ b/src/mame/drivers/mpu4crystal.hxx
diff --git a/src/mame/drivers/mpu4empire.inc b/src/mame/drivers/mpu4empire.hxx
index edb0dc3ce3f..edb0dc3ce3f 100644
--- a/src/mame/drivers/mpu4empire.inc
+++ b/src/mame/drivers/mpu4empire.hxx
diff --git a/src/mame/drivers/mpu4mdm.inc b/src/mame/drivers/mpu4mdm.hxx
index a188487166a..a188487166a 100644
--- a/src/mame/drivers/mpu4mdm.inc
+++ b/src/mame/drivers/mpu4mdm.hxx
diff --git a/src/mame/drivers/mpu4misc.inc b/src/mame/drivers/mpu4misc.hxx
index 7838c9d4c51..7838c9d4c51 100644
--- a/src/mame/drivers/mpu4misc.inc
+++ b/src/mame/drivers/mpu4misc.hxx
diff --git a/src/mame/drivers/mpu4mod2sw.inc b/src/mame/drivers/mpu4mod2sw.hxx
index 6ec4dab2044..6ec4dab2044 100644
--- a/src/mame/drivers/mpu4mod2sw.inc
+++ b/src/mame/drivers/mpu4mod2sw.hxx
diff --git a/src/mame/drivers/mpu4mod4yam.inc b/src/mame/drivers/mpu4mod4yam.hxx
index 0df27c2b378..0df27c2b378 100644
--- a/src/mame/drivers/mpu4mod4yam.inc
+++ b/src/mame/drivers/mpu4mod4yam.hxx
diff --git a/src/mame/drivers/mpu4sw.inc b/src/mame/drivers/mpu4sw.hxx
index 20c69223261..20c69223261 100644
--- a/src/mame/drivers/mpu4sw.inc
+++ b/src/mame/drivers/mpu4sw.hxx
diff --git a/src/mame/drivers/mpu4union.inc b/src/mame/drivers/mpu4union.hxx
index 4a335b060af..4a335b060af 100644
--- a/src/mame/drivers/mpu4union.inc
+++ b/src/mame/drivers/mpu4union.hxx
diff --git a/src/mame/drivers/mpu5.cpp b/src/mame/drivers/mpu5.cpp
index 8c527bb14ba..068b54fe23d 100644
--- a/src/mame/drivers/mpu5.cpp
+++ b/src/mame/drivers/mpu5.cpp
@@ -401,4 +401,4 @@ MACHINE_CONFIG_START( mpu5, mpu5_state )
/* unknown sound */
MACHINE_CONFIG_END
-#include "mpu5.inc"
+#include "mpu5.hxx"
diff --git a/src/mame/drivers/mpu5.inc b/src/mame/drivers/mpu5.hxx
index 2da1a540f8d..2da1a540f8d 100644
--- a/src/mame/drivers/mpu5.inc
+++ b/src/mame/drivers/mpu5.hxx
diff --git a/src/mame/drivers/multfish_ref.inc b/src/mame/drivers/multfish_ref.hxx
index e5e4f13102f..e5e4f13102f 100644
--- a/src/mame/drivers/multfish_ref.inc
+++ b/src/mame/drivers/multfish_ref.hxx
diff --git a/src/mame/drivers/neodriv.inc b/src/mame/drivers/neodriv.hxx
index 810839cfdae..810839cfdae 100644
--- a/src/mame/drivers/neodriv.inc
+++ b/src/mame/drivers/neodriv.hxx
diff --git a/src/mame/drivers/neogeo.cpp b/src/mame/drivers/neogeo.cpp
index c1d7503c321..c5da7ec0843 100644
--- a/src/mame/drivers/neogeo.cpp
+++ b/src/mame/drivers/neogeo.cpp
@@ -2038,5 +2038,5 @@ CONS( 1990, aes, 0, 0, aes, aes, driver_device, 0,
// Include standalone drivers for the single games
-#include "neodriv.inc"
+#include "neodriv.hxx"
diff --git a/src/mame/drivers/palm.cpp b/src/mame/drivers/palm.cpp
index ccc5e72f438..57331092f30 100644
--- a/src/mame/drivers/palm.cpp
+++ b/src/mame/drivers/palm.cpp
@@ -501,4 +501,4 @@ COMP( 19??, spt1500, pilot1k, 0, palmvx, palm, driver_device, 0
COMP( 19??, spt1700, pilot1k, 0, palmvx, palm, driver_device, 0, "Symbol", "SPT 1700", MACHINE_NOT_WORKING )
COMP( 19??, spt1740, pilot1k, 0, palmvx, palm, driver_device, 0, "Symbol", "SPT 1740", MACHINE_NOT_WORKING )
-#include "palm_dbg.inc"
+#include "palm_dbg.hxx"
diff --git a/src/mame/drivers/palm_dbg.inc b/src/mame/drivers/palm_dbg.hxx
index 8c89146b955..8c89146b955 100644
--- a/src/mame/drivers/palm_dbg.inc
+++ b/src/mame/drivers/palm_dbg.hxx
diff --git a/src/mame/drivers/unkfr.inc b/src/mame/drivers/unkfr.hxx
index 296f58b3cbd..296f58b3cbd 100644
--- a/src/mame/drivers/unkfr.inc
+++ b/src/mame/drivers/unkfr.hxx
diff --git a/src/mame/drivers/ymmu100.cpp b/src/mame/drivers/ymmu100.cpp
index a109418b62e..6481a467be5 100644
--- a/src/mame/drivers/ymmu100.cpp
+++ b/src/mame/drivers/ymmu100.cpp
@@ -205,7 +205,7 @@ public:
virtual DECLARE_READ16_MEMBER(adc7_r) override;
};
-#include "../drivers/ymmu100.inc"
+#include "../drivers/ymmu100.hxx"
void mu100_state::machine_start()
{
diff --git a/src/mame/includes/model2.h b/src/mame/includes/model2.h
index 1f4bbcaa6d5..1330c1245e2 100644
--- a/src/mame/includes/model2.h
+++ b/src/mame/includes/model2.h
@@ -293,56 +293,56 @@ public:
/* checker = 0, textured = 0, transparent = 0 */
#define MODEL2_FUNC 0
#define MODEL2_FUNC_NAME model2_3d_render_0
- #include "video/model2rd.inc"
+ #include "video/model2rd.hxx"
#undef MODEL2_FUNC
#undef MODEL2_FUNC_NAME
/* checker = 0, textured = 0, translucent = 1 */
#define MODEL2_FUNC 1
#define MODEL2_FUNC_NAME model2_3d_render_1
- #include "video/model2rd.inc"
+ #include "video/model2rd.hxx"
#undef MODEL2_FUNC
#undef MODEL2_FUNC_NAME
/* checker = 0, textured = 1, translucent = 0 */
#define MODEL2_FUNC 2
#define MODEL2_FUNC_NAME model2_3d_render_2
- #include "video/model2rd.inc"
+ #include "video/model2rd.hxx"
#undef MODEL2_FUNC
#undef MODEL2_FUNC_NAME
/* checker = 0, textured = 1, translucent = 1 */
#define MODEL2_FUNC 3
#define MODEL2_FUNC_NAME model2_3d_render_3
- #include "video/model2rd.inc"
+ #include "video/model2rd.hxx"
#undef MODEL2_FUNC
#undef MODEL2_FUNC_NAME
/* checker = 1, textured = 0, translucent = 0 */
#define MODEL2_FUNC 4
#define MODEL2_FUNC_NAME model2_3d_render_4
- #include "video/model2rd.inc"
+ #include "video/model2rd.hxx"
#undef MODEL2_FUNC
#undef MODEL2_FUNC_NAME
/* checker = 1, textured = 0, translucent = 1 */
#define MODEL2_FUNC 5
#define MODEL2_FUNC_NAME model2_3d_render_5
- #include "video/model2rd.inc"
+ #include "video/model2rd.hxx"
#undef MODEL2_FUNC
#undef MODEL2_FUNC_NAME
/* checker = 1, textured = 1, translucent = 0 */
#define MODEL2_FUNC 6
#define MODEL2_FUNC_NAME model2_3d_render_6
- #include "video/model2rd.inc"
+ #include "video/model2rd.hxx"
#undef MODEL2_FUNC
#undef MODEL2_FUNC_NAME
/* checker = 1, textured = 1, translucent = 1 */
#define MODEL2_FUNC 7
#define MODEL2_FUNC_NAME model2_3d_render_7
- #include "video/model2rd.inc"
+ #include "video/model2rd.hxx"
#undef MODEL2_FUNC
#undef MODEL2_FUNC_NAME
diff --git a/src/mame/machine/cx4data.inc b/src/mame/machine/cx4data.hxx
index b7d1610a304..b7d1610a304 100644
--- a/src/mame/machine/cx4data.inc
+++ b/src/mame/machine/cx4data.hxx
diff --git a/src/mame/machine/cx4fn.inc b/src/mame/machine/cx4fn.hxx
index 2b5a302a227..2b5a302a227 100644
--- a/src/mame/machine/cx4fn.inc
+++ b/src/mame/machine/cx4fn.hxx
diff --git a/src/mame/machine/cx4oam.inc b/src/mame/machine/cx4oam.hxx
index abf74defea2..abf74defea2 100644
--- a/src/mame/machine/cx4oam.inc
+++ b/src/mame/machine/cx4oam.hxx
diff --git a/src/mame/machine/cx4ops.inc b/src/mame/machine/cx4ops.hxx
index 02b97bc944d..02b97bc944d 100644
--- a/src/mame/machine/cx4ops.inc
+++ b/src/mame/machine/cx4ops.hxx
diff --git a/src/mame/machine/snescx4.cpp b/src/mame/machine/snescx4.cpp
index a4a200452a2..a270a9fc8bd 100644
--- a/src/mame/machine/snescx4.cpp
+++ b/src/mame/machine/snescx4.cpp
@@ -25,8 +25,8 @@ static void CX4_writew(running_machine &machine, UINT16 addr, UINT16 data);
static void CX4_C4DrawLine(INT32 X1, INT32 Y1, INT16 Z1, INT32 X2, INT32 Y2, INT16 Z2, UINT8 Color);
-#include "machine/cx4data.inc"
-#include "machine/cx4fn.inc"
+#include "machine/cx4data.hxx"
+#include "machine/cx4fn.hxx"
static UINT32 CX4_ldr(UINT8 r)
{
@@ -115,8 +115,8 @@ static void CX4_transfer_data(running_machine &machine)
}
}
-#include "machine/cx4oam.inc"
-#include "machine/cx4ops.inc"
+#include "machine/cx4oam.hxx"
+#include "machine/cx4ops.hxx"
void CX4_write(running_machine &machine, UINT32 addr, UINT8 data)
{
diff --git a/src/mame/video/hng64.cpp b/src/mame/video/hng64.cpp
index 3e8d18e4d82..34b9e89d404 100644
--- a/src/mame/video/hng64.cpp
+++ b/src/mame/video/hng64.cpp
@@ -1296,5 +1296,5 @@ void hng64_state::video_start()
m_vertsrom_size = memregion("verts")->bytes();
}
-#include "video/hng64_3d.inc"
-#include "video/hng64_sprite.inc"
+#include "video/hng64_3d.hxx"
+#include "video/hng64_sprite.hxx"
diff --git a/src/mame/video/hng64_3d.inc b/src/mame/video/hng64_3d.hxx
index b29c66414f7..b29c66414f7 100644
--- a/src/mame/video/hng64_3d.inc
+++ b/src/mame/video/hng64_3d.hxx
diff --git a/src/mame/video/hng64_sprite.inc b/src/mame/video/hng64_sprite.hxx
index b24d93753c9..b24d93753c9 100644
--- a/src/mame/video/hng64_sprite.inc
+++ b/src/mame/video/hng64_sprite.hxx
diff --git a/src/mame/video/jagblit.inc b/src/mame/video/jagblit.hxx
index 6b75f1f4b2d..7051e9aed91 100644
--- a/src/mame/video/jagblit.inc
+++ b/src/mame/video/jagblit.hxx
@@ -12,7 +12,7 @@
#define COMMAND -- blitter command bits for blitter
#define A1FIXED -- fixed A1 flag bits for blitter
#define A2FIXED -- fixed A2 flag bits for blitter
- #include "jagblit.inc"
+ #include "jagblit.hxx"
****************************************************************************/
diff --git a/src/mame/video/jagobj.inc b/src/mame/video/jagobj.hxx
index d50702a3290..d50702a3290 100644
--- a/src/mame/video/jagobj.inc
+++ b/src/mame/video/jagobj.hxx
diff --git a/src/mame/video/jaguar.cpp b/src/mame/video/jaguar.cpp
index 216b3743d04..3e0803cfb90 100644
--- a/src/mame/video/jaguar.cpp
+++ b/src/mame/video/jaguar.cpp
@@ -861,7 +861,7 @@ UINT32 jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
*************************************/
#define INCLUDE_OBJECT_PROCESSOR
-#include "jagobj.inc"
+#include "jagobj.hxx"
@@ -876,7 +876,7 @@ UINT32 jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
#define COMMAND command
#define A1FIXED a1flags
#define A2FIXED a2flags
-#include "jagblit.inc"
+#include "jagblit.hxx"
#undef A2FIXED
#undef A1FIXED
#undef COMMAND
@@ -887,7 +887,7 @@ UINT32 jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
#define COMMAND 0x09800001
#define A1FIXED 0x010020
#define A2FIXED 0x010020
-#include "jagblit.inc"
+#include "jagblit.hxx"
#undef A2FIXED
#undef A1FIXED
#undef COMMAND
@@ -897,7 +897,7 @@ UINT32 jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
#define COMMAND 0x09800009
#define A1FIXED 0x000020
#define A2FIXED 0x000020
-#include "jagblit.inc"
+#include "jagblit.hxx"
#undef A2FIXED
#undef A1FIXED
#undef COMMAND
@@ -907,7 +907,7 @@ UINT32 jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
#define COMMAND 0x01800009
#define A1FIXED 0x000028
#define A2FIXED 0x000028
-#include "jagblit.inc"
+#include "jagblit.hxx"
#undef A2FIXED
#undef A1FIXED
#undef COMMAND
@@ -917,7 +917,7 @@ UINT32 jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
#define COMMAND 0x01800001
#define A1FIXED 0x000018
#define A2FIXED 0x000018
-#include "jagblit.inc"
+#include "jagblit.hxx"
#undef A2FIXED
#undef A1FIXED
#undef COMMAND
@@ -927,7 +927,7 @@ UINT32 jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
#define COMMAND 0x01c00001
#define A1FIXED 0x000018
#define A2FIXED 0x000018
-#include "jagblit.inc"
+#include "jagblit.hxx"
#undef A2FIXED
#undef A1FIXED
#undef COMMAND
@@ -938,7 +938,7 @@ UINT32 jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
#define COMMAND 0x00010000
#define A1FIXED a1flags
#define A2FIXED a2flags
-#include "jagblit.inc"
+#include "jagblit.hxx"
#undef A2FIXED
#undef A1FIXED
#undef COMMAND
@@ -948,7 +948,7 @@ UINT32 jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
#define COMMAND 0x01800001
#define A1FIXED a1flags
#define A2FIXED a2flags
-#include "jagblit.inc"
+#include "jagblit.hxx"
#undef A2FIXED
#undef A1FIXED
#undef COMMAND
@@ -958,7 +958,7 @@ UINT32 jaguar_state::screen_update(screen_device &screen, bitmap_rgb32 &bitmap,
#define COMMAND ((command & 0xf0000f00) | 0x01800001)
#define A1FIXED a1flags
#define A2FIXED a2flags
-#include "jagblit.inc"
+#include "jagblit.hxx"
#undef A2FIXED
#undef A1FIXED
#undef COMMAND
diff --git a/src/mame/video/model2rd.inc b/src/mame/video/model2rd.hxx
index 0fd6e8f1705..0fd6e8f1705 100644
--- a/src/mame/video/model2rd.inc
+++ b/src/mame/video/model2rd.hxx
diff --git a/src/mame/video/n64.cpp b/src/mame/video/n64.cpp
index 85033978fca..13ee70bb950 100644
--- a/src/mame/video/n64.cpp
+++ b/src/mame/video/n64.cpp
@@ -63,7 +63,7 @@ bool n64_rdp::rdp_range_check(UINT32 addr)
/*****************************************************************************/
// The functions in this file should be moved into the parent Processor class.
-#include "rdpfiltr.inc"
+#include "rdpfiltr.hxx"
INT32 n64_rdp::get_alpha_cvg(INT32 comb_alpha, rdp_span_aux* userdata, const rdp_poly_state &object)
{
diff --git a/src/mame/video/rdpfiltr.inc b/src/mame/video/rdpfiltr.hxx
index 019a928a727..019a928a727 100644
--- a/src/mame/video/rdpfiltr.inc
+++ b/src/mame/video/rdpfiltr.hxx
diff --git a/src/osd/modules/render/drawgdi.cpp b/src/osd/modules/render/drawgdi.cpp
index 6d6b98218b6..7822314e7f4 100644
--- a/src/osd/modules/render/drawgdi.cpp
+++ b/src/osd/modules/render/drawgdi.cpp
@@ -7,7 +7,7 @@
//============================================================
#include "drawgdi.h"
-#include "rendersw.inc"
+#include "rendersw.hxx"
//============================================================
// destructor
diff --git a/src/osd/modules/render/drawsdl.cpp b/src/osd/modules/render/drawsdl.cpp
index 81943bf9165..5cbf63ec056 100644
--- a/src/osd/modules/render/drawsdl.cpp
+++ b/src/osd/modules/render/drawsdl.cpp
@@ -17,7 +17,7 @@
// MAME headers
#include "emu.h"
#include "ui/uimain.h"
-#include "rendersw.inc"
+#include "rendersw.hxx"
// standard SDL headers
#include "sdlinc.h"
diff --git a/src/tools/srcclean.cpp b/src/tools/srcclean.cpp
index 0af298a4441..6f5c7c7f455 100644
--- a/src/tools/srcclean.cpp
+++ b/src/tools/srcclean.cpp
@@ -125,7 +125,7 @@ int main(int argc, char *argv[])
/* determine if we are a C file */
ext = strrchr(argv[1], '.');
- is_c_file = (ext && (core_stricmp(ext, ".c") == 0 || core_stricmp(ext, ".h") == 0 || core_stricmp(ext, ".cpp") == 0 || core_stricmp(ext, ".inc") == 0 || core_stricmp(ext, ".lst") == 0));
+ is_c_file = (ext && (core_stricmp(ext, ".c") == 0 || core_stricmp(ext, ".h") == 0 || core_stricmp(ext, ".cpp") == 0 || core_stricmp(ext, ".hxx") == 0 || core_stricmp(ext, ".lst") == 0));
is_xml_file = (ext && core_stricmp(ext, ".xml") == 0);
/* rip through it */