diff --git a/scripts/target/mame/mame.lua b/scripts/target/mame/mame.lua index 9fd09287cab..299702f55d8 100644 --- a/scripts/target/mame/mame.lua +++ b/scripts/target/mame/mame.lua @@ -1246,7 +1246,6 @@ FORMATS["ZX81_P"] = true function linkProjects_mame_mame(_target, _subtarget) links { "access", - "aci", "acorn", "act", "adc", @@ -1265,7 +1264,8 @@ function linkProjects_mame_mame(_target, _subtarget) "apf", "apollo", "apple", - "applied", + "appliedconcepts", + "appliedtech", "arcadia", "aristocr", "ascii", @@ -1363,7 +1363,7 @@ function linkProjects_mame_mame(_target, _subtarget) "hds", "heathkit", "hec2hrp", - "hegener", + "hegenerglaser", "heurikon", "hitachi", "homebrew", @@ -1650,11 +1650,6 @@ files { MAME_DIR .. "src/mame/access/*.cpp", } -createMAMEProjects(_target, _subtarget, "aci") -files { - MAME_DIR .. "src/mame/aci/*.cpp", -} - createMAMEProjects(_target, _subtarget, "acorn") files { MAME_DIR .. "src/mame/acorn/*.cpp", @@ -1756,10 +1751,15 @@ files { MAME_DIR .. "src/mame/apple/*.h", } -createMAMEProjects(_target, _subtarget, "applied") +createMAMEProjects(_target, _subtarget, "appliedconcepts") files { - MAME_DIR .. "src/mame/applied/*.cpp", - MAME_DIR .. "src/mame/applied/*.h", + MAME_DIR .. "src/mame/appliedconcepts/*.cpp", +} + +createMAMEProjects(_target, _subtarget, "appliedtech") +files { + MAME_DIR .. "src/mame/appliedtech/*.cpp", + MAME_DIR .. "src/mame/appliedtech/*.h", } createMAMEProjects(_target, _subtarget, "arcadia") @@ -2313,10 +2313,10 @@ files { MAME_DIR .. "src/mame/hec2hrp/*.h", } -createMAMEProjects(_target, _subtarget, "hegener") +createMAMEProjects(_target, _subtarget, "hegenerglaser") files { - MAME_DIR .. "src/mame/hegener/*.cpp", - MAME_DIR .. "src/mame/hegener/*.h", + MAME_DIR .. "src/mame/hegenerglaser/*.cpp", + MAME_DIR .. "src/mame/hegenerglaser/*.h", } createMAMEProjects(_target, _subtarget, "heurikon") diff --git a/src/mame/aci/boris.cpp b/src/mame/appliedconcepts/boris.cpp similarity index 100% rename from src/mame/aci/boris.cpp rename to src/mame/appliedconcepts/boris.cpp diff --git a/src/mame/aci/borisdpl.cpp b/src/mame/appliedconcepts/borisdpl.cpp similarity index 100% rename from src/mame/aci/borisdpl.cpp rename to src/mame/appliedconcepts/borisdpl.cpp diff --git a/src/mame/aci/ggm.cpp b/src/mame/appliedconcepts/ggm.cpp similarity index 100% rename from src/mame/aci/ggm.cpp rename to src/mame/appliedconcepts/ggm.cpp diff --git a/src/mame/aci/prodigy.cpp b/src/mame/appliedconcepts/prodigy.cpp similarity index 100% rename from src/mame/aci/prodigy.cpp rename to src/mame/appliedconcepts/prodigy.cpp diff --git a/src/mame/applied/mbee.cpp b/src/mame/appliedtech/mbee.cpp similarity index 100% rename from src/mame/applied/mbee.cpp rename to src/mame/appliedtech/mbee.cpp diff --git a/src/mame/applied/mbee.h b/src/mame/appliedtech/mbee.h similarity index 100% rename from src/mame/applied/mbee.h rename to src/mame/appliedtech/mbee.h diff --git a/src/mame/applied/mbee_m.cpp b/src/mame/appliedtech/mbee_m.cpp similarity index 100% rename from src/mame/applied/mbee_m.cpp rename to src/mame/appliedtech/mbee_m.cpp diff --git a/src/mame/applied/mbee_v.cpp b/src/mame/appliedtech/mbee_v.cpp similarity index 100% rename from src/mame/applied/mbee_v.cpp rename to src/mame/appliedtech/mbee_v.cpp diff --git a/src/mame/hegener/academy.cpp b/src/mame/hegenerglaser/academy.cpp similarity index 100% rename from src/mame/hegener/academy.cpp rename to src/mame/hegenerglaser/academy.cpp diff --git a/src/mame/hegener/amsterdam.cpp b/src/mame/hegenerglaser/amsterdam.cpp similarity index 100% rename from src/mame/hegener/amsterdam.cpp rename to src/mame/hegenerglaser/amsterdam.cpp diff --git a/src/mame/hegener/berlin.cpp b/src/mame/hegenerglaser/berlin.cpp similarity index 100% rename from src/mame/hegener/berlin.cpp rename to src/mame/hegenerglaser/berlin.cpp diff --git a/src/mame/hegener/brikett.cpp b/src/mame/hegenerglaser/brikett.cpp similarity index 100% rename from src/mame/hegener/brikett.cpp rename to src/mame/hegenerglaser/brikett.cpp diff --git a/src/mame/hegener/glasgow.cpp b/src/mame/hegenerglaser/glasgow.cpp similarity index 100% rename from src/mame/hegener/glasgow.cpp rename to src/mame/hegenerglaser/glasgow.cpp diff --git a/src/mame/hegener/milano.cpp b/src/mame/hegenerglaser/milano.cpp similarity index 100% rename from src/mame/hegener/milano.cpp rename to src/mame/hegenerglaser/milano.cpp diff --git a/src/mame/hegener/mm1.cpp b/src/mame/hegenerglaser/mm1.cpp similarity index 100% rename from src/mame/hegener/mm1.cpp rename to src/mame/hegenerglaser/mm1.cpp diff --git a/src/mame/hegener/mm2.cpp b/src/mame/hegenerglaser/mm2.cpp similarity index 100% rename from src/mame/hegener/mm2.cpp rename to src/mame/hegenerglaser/mm2.cpp diff --git a/src/mame/hegener/mmboard.cpp b/src/mame/hegenerglaser/mmboard.cpp similarity index 100% rename from src/mame/hegener/mmboard.cpp rename to src/mame/hegenerglaser/mmboard.cpp diff --git a/src/mame/hegener/mmboard.h b/src/mame/hegenerglaser/mmboard.h similarity index 100% rename from src/mame/hegener/mmboard.h rename to src/mame/hegenerglaser/mmboard.h diff --git a/src/mame/hegener/mmdisplay1.cpp b/src/mame/hegenerglaser/mmdisplay1.cpp similarity index 100% rename from src/mame/hegener/mmdisplay1.cpp rename to src/mame/hegenerglaser/mmdisplay1.cpp diff --git a/src/mame/hegener/mmdisplay1.h b/src/mame/hegenerglaser/mmdisplay1.h similarity index 100% rename from src/mame/hegener/mmdisplay1.h rename to src/mame/hegenerglaser/mmdisplay1.h diff --git a/src/mame/hegener/mmdisplay2.cpp b/src/mame/hegenerglaser/mmdisplay2.cpp similarity index 100% rename from src/mame/hegener/mmdisplay2.cpp rename to src/mame/hegenerglaser/mmdisplay2.cpp diff --git a/src/mame/hegener/mmdisplay2.h b/src/mame/hegenerglaser/mmdisplay2.h similarity index 100% rename from src/mame/hegener/mmdisplay2.h rename to src/mame/hegenerglaser/mmdisplay2.h diff --git a/src/mame/hegener/modena.cpp b/src/mame/hegenerglaser/modena.cpp similarity index 100% rename from src/mame/hegener/modena.cpp rename to src/mame/hegenerglaser/modena.cpp diff --git a/src/mame/hegener/modular.cpp b/src/mame/hegenerglaser/modular.cpp similarity index 100% rename from src/mame/hegener/modular.cpp rename to src/mame/hegenerglaser/modular.cpp diff --git a/src/mame/hegener/modular_tm.cpp b/src/mame/hegenerglaser/modular_tm.cpp similarity index 100% rename from src/mame/hegener/modular_tm.cpp rename to src/mame/hegenerglaser/modular_tm.cpp diff --git a/src/mame/hegener/mondial.cpp b/src/mame/hegenerglaser/mondial.cpp similarity index 100% rename from src/mame/hegener/mondial.cpp rename to src/mame/hegenerglaser/mondial.cpp diff --git a/src/mame/hegener/mondial2.cpp b/src/mame/hegenerglaser/mondial2.cpp similarity index 100% rename from src/mame/hegener/mondial2.cpp rename to src/mame/hegenerglaser/mondial2.cpp diff --git a/src/mame/hegener/mondial68k.cpp b/src/mame/hegenerglaser/mondial68k.cpp similarity index 100% rename from src/mame/hegener/mondial68k.cpp rename to src/mame/hegenerglaser/mondial68k.cpp diff --git a/src/mame/hegener/montec.cpp b/src/mame/hegenerglaser/montec.cpp similarity index 100% rename from src/mame/hegener/montec.cpp rename to src/mame/hegenerglaser/montec.cpp diff --git a/src/mame/hegener/polgar.cpp b/src/mame/hegenerglaser/polgar.cpp similarity index 100% rename from src/mame/hegener/polgar.cpp rename to src/mame/hegenerglaser/polgar.cpp diff --git a/src/mame/hegener/risc.cpp b/src/mame/hegenerglaser/risc.cpp similarity index 100% rename from src/mame/hegener/risc.cpp rename to src/mame/hegenerglaser/risc.cpp diff --git a/src/mame/hegener/smondial.cpp b/src/mame/hegenerglaser/smondial.cpp similarity index 100% rename from src/mame/hegener/smondial.cpp rename to src/mame/hegenerglaser/smondial.cpp diff --git a/src/mame/mame.lst b/src/mame/mame.lst index 95ee7e2f4ae..56c3a3c5b73 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -911,17 +911,17 @@ sp_zigzgk // sp_zigzgl // sp_zigzgm // -@source:aci/boris.cpp +@source:appliedconcepts/boris.cpp boris // borisa // -@source:aci/borisdpl.cpp +@source:appliedconcepts/borisdpl.cpp borisdpl // -@source:aci/ggm.cpp +@source:appliedconcepts/ggm.cpp ggm -@source:aci/prodigy.cpp +@source:appliedconcepts/prodigy.cpp prodigy @source:jaleco/acommand.cpp @@ -22909,7 +22909,7 @@ mbc200 // @source:sanyo/mbc55x.cpp mbc55x // Sanyo MBC-550, MBC-555 -@source:applied/mbee.cpp +@source:appliedtech/mbee.cpp mbee // Microbee 16 Standard or Plus mbee128 // Microbee 128K standard (CP/M) mbee128p // Microbee 128K premium (CP/M) @@ -23271,26 +23271,26 @@ mekd5 // 1980 Motorola Evaluation Kit crzyddz2 // 2006 Sealy menghong // 2004? Sealy -@source:hegener/academy.cpp +@source:hegenerglaser/academy.cpp academy academyg academyga -@source:hegener/amsterdam.cpp +@source:hegenerglaser/amsterdam.cpp amsterd // Amsterdam dallas16 // Dallas dallas32 // Dallas roma16 // Roma roma32 // Roma -@source:hegener/berlin.cpp +@source:hegenerglaser/berlin.cpp berl16 // 1992 Mephisto Berlin 68000 berl16a // 1992 Mephisto Berlin 68000 berlinp // 1994 Mephisto Berlin Pro 68020 berl16l // 1996 Mephisto Berlin 68000 London Upgrade berlinpl // 1996 Mephisto Berlin Pro London Upgrade -@source:hegener/brikett.cpp +@source:hegenerglaser/brikett.cpp mephisto mephisto1x mephisto2 @@ -23302,23 +23302,23 @@ mephisto3b mephisto3c mephistoj -@source:hegener/glasgow.cpp +@source:hegenerglaser/glasgow.cpp amsterda // Amsterdam dallas16a // Dallas glasgow // Glasgow roma16a // Roma -@source:hegener/milano.cpp +@source:hegenerglaser/milano.cpp milano // 1991 Mephisto Milano milanoa // 1991 Mephisto Milano nshort // 1993 Mephisto Nigel Short -@source:hegener/mm1.cpp +@source:hegenerglaser/mm1.cpp mm1 mm1b mmirage -@source:hegener/mm2.cpp +@source:hegenerglaser/mm2.cpp mm2 // Mephisto MM II mm2a // Mephisto MM II mm2b // Mephisto MM II @@ -23337,12 +23337,12 @@ mm5p rebel5 // Mephisto Rebell 5.0 rebel5a // Mephisto Rebell 5.0 -@source:hegener/modena.cpp +@source:hegenerglaser/modena.cpp modena // 1992 Mephisto Modena modenaa // 1992 Mephisto Modena modenab // 1992 Mephisto Modena -@source:hegener/modular.cpp +@source:hegenerglaser/modular.cpp alm16 // 1988 Mephisto Almeria 16 Bit alm32 // 1988 Mephisto Almeria 32 Bit port16 // 1989 Mephisto Portorose 16 Bit @@ -23359,7 +23359,7 @@ gen32l // 1996 Mephisto Genius 68030 London Upgrade lond16 // 1996 Mephisto London 16 Bit lond32 // 1996 Mephisto London 32 Bit -@source:hegener/modular_tm.cpp +@source:hegenerglaser/modular_tm.cpp port32t lyon32t lyon32t8 @@ -23369,32 +23369,32 @@ berl32t8p lond32t lond32t8 -@source:hegener/mondial.cpp +@source:hegenerglaser/mondial.cpp mondial // 1985 Mephisto Mondial -@source:hegener/mondial2.cpp +@source:hegenerglaser/mondial2.cpp mondial2 // 1987 Mephisto Mondial II -@source:hegener/mondial68k.cpp +@source:hegenerglaser/mondial68k.cpp mondl68k // 1988 Mephisto Mondial 68000XL -@source:hegener/montec.cpp +@source:hegenerglaser/montec.cpp montec // 1987 Mephisto Monte Carlo monteca // 1987 Mephisto Monte Carlo montec4 // 1989 Mephisto Monte Carlo IV montec4le // 1990 Mephisto Monte Carlo IV LE -@source:hegener/polgar.cpp +@source:hegenerglaser/polgar.cpp polgar // 1990 Mephisto Polgar polgara // 1989 Mephisto Polgar polgar10 // 1990 Mephisto Polgar 10MHz polgar101 // 1990 Mephisto Polgar 10MHz -@source:hegener/risc.cpp +@source:hegenerglaser/risc.cpp mrisc // 1992 Mephisto RISC 1MB mrisc2 // 1994 Mephisto RISC II -@source:hegener/smondial.cpp +@source:hegenerglaser/smondial.cpp mega4 // 1989 Mephisto Mega IV mega4a // 1989 Mephisto Mega IV smondial // 1986 Mephisto Super Mondial (Ver A) diff --git a/src/mame/mess.flt b/src/mame/mess.flt index da3186557cd..e539042de06 100644 --- a/src/mame/mess.flt +++ b/src/mame/mess.flt @@ -1,8 +1,4 @@ access/acvirus.cpp -aci/boris.cpp -aci/borisdpl.cpp -aci/ggm.cpp -aci/prodigy.cpp acorn/aa310.cpp acorn/accomm.cpp acorn/acrnsys.cpp @@ -60,7 +56,11 @@ apple/macprtb.cpp apple/macpwrbk030.cpp apple/macquadra700.cpp apple/tk2000.cpp -applied/mbee.cpp +appliedconcepts/boris.cpp +appliedconcepts/borisdpl.cpp +appliedconcepts/ggm.cpp +appliedconcepts/prodigy.cpp +appliedtech/mbee.cpp arcadia/arcadia.cpp ascii/msx.cpp at/at.cpp @@ -298,24 +298,24 @@ heathkit/h19.cpp heathkit/h8.cpp heathkit/h89.cpp hec2hrp/hec2hrp.cpp -hegener/academy.cpp -hegener/amsterdam.cpp -hegener/berlin.cpp -hegener/brikett.cpp -hegener/glasgow.cpp -hegener/milano.cpp -hegener/mm1.cpp -hegener/mm2.cpp -hegener/modena.cpp -hegener/modular.cpp -hegener/modular_tm.cpp -hegener/mondial.cpp -hegener/mondial2.cpp -hegener/mondial68k.cpp -hegener/montec.cpp -hegener/polgar.cpp -hegener/risc.cpp -hegener/smondial.cpp +hegenerglaser/academy.cpp +hegenerglaser/amsterdam.cpp +hegenerglaser/berlin.cpp +hegenerglaser/brikett.cpp +hegenerglaser/glasgow.cpp +hegenerglaser/milano.cpp +hegenerglaser/mm1.cpp +hegenerglaser/mm2.cpp +hegenerglaser/modena.cpp +hegenerglaser/modular.cpp +hegenerglaser/modular_tm.cpp +hegenerglaser/mondial.cpp +hegenerglaser/mondial2.cpp +hegenerglaser/mondial68k.cpp +hegenerglaser/montec.cpp +hegenerglaser/polgar.cpp +hegenerglaser/risc.cpp +hegenerglaser/smondial.cpp heurikon/hk68v10.cpp hitachi/b16.cpp hitachi/bmjr.cpp diff --git a/src/mame/misc_handheld/README.md b/src/mame/misc_handheld/README.md index 7a55da33a82..a5c5ca5e053 100644 --- a/src/mame/misc_handheld/README.md +++ b/src/mame/misc_handheld/README.md @@ -1,4 +1,4 @@ # **src/mame/misc_handheld** # Folder for miscellaneous handheld/tabletop drivers, where the number of drivers is too small to place them in specific company folders. -This also includes the hh_ collection drivers. \ No newline at end of file +This also includes the hh_ collection drivers and their subclasses. \ No newline at end of file