source org: merge elektronika with cccp

This commit is contained in:
hap 2022-06-29 15:25:19 +02:00
parent 7a434982fb
commit f4d278a215
13 changed files with 16 additions and 23 deletions

View File

@ -1333,7 +1333,6 @@ function linkProjects_mame_mame(_target, _subtarget)
"einis", "einis",
"elektor", "elektor",
"elektron", "elektron",
"elektronika",
"emusys", "emusys",
"ensoniq", "ensoniq",
"enterprise", "enterprise",
@ -2157,12 +2156,6 @@ files {
MAME_DIR .. "src/mame/elektron/*.cpp", MAME_DIR .. "src/mame/elektron/*.cpp",
} }
createMAMEProjects(_target, _subtarget, "elektronika")
files {
MAME_DIR .. "src/mame/elektronika/*.cpp",
MAME_DIR .. "src/mame/elektronika/*.h",
}
createMAMEProjects(_target, _subtarget, "emusys") createMAMEProjects(_target, _subtarget, "emusys")
files { files {
MAME_DIR .. "src/mame/emusys/*.cpp", MAME_DIR .. "src/mame/emusys/*.cpp",

View File

@ -9444,7 +9444,7 @@ t3210 //
bitgrpha // bitgrpha //
bitgrphb // bitgrphb //
@source:elektronika/bk.cpp @source:cccp/bk.cpp
bk0010 // bk0010 //
bk001001 // bk001001 //
bk0010fd // bk0010fd //
@ -12798,10 +12798,10 @@ duet16 //
@source:igs/dunhuang.cpp @source:igs/dunhuang.cpp
dunhuang // (c) 1995 dunhuang // (c) 1995
@source:elektronika/dvk_kcgd.cpp @source:cccp/dvk_kcgd.cpp
dvk_kcgd // dvk_kcgd //
@source:elektronika/dvk_ksm.cpp @source:cccp/dvk_ksm.cpp
dvk_ksm // dvk_ksm //
@source:misc/dwarfd.cpp @source:misc/dwarfd.cpp
@ -17371,7 +17371,7 @@ ikki // TVG17 (c) 1985 Sun Electronics (Japan)
@source:skeleton/ikt5a.cpp @source:skeleton/ikt5a.cpp
ikt5a // ikt5a //
@source:elektronika/im01.cpp @source:cccp/im01.cpp
im01 im01
im01t im01t
im05 im05
@ -24050,13 +24050,13 @@ mk1forth // (c) 2003 Andrew Holme
@source:trainer/mk14.cpp @source:trainer/mk14.cpp
mk14 // mk14 //
@source:elektronika/mk85.cpp @source:cccp/mk85.cpp
mk85 // mk85 //
@source:elektronika/mk90.cpp @source:cccp/mk90.cpp
mk90 // mk90 //
@source:elektronika/mk98.cpp @source:cccp/mk98.cpp
mk98 // mk98 //
@source:multitch/mkit09.cpp @source:multitch/mkit09.cpp
@ -31118,7 +31118,7 @@ mrjong // (c) 1983 Kiwako
@source:skeleton/ms0515.cpp @source:skeleton/ms0515.cpp
ms0515 // ms0515 //
@source:elektronika/ms6102.cpp @source:cccp/ms6102.cpp
ms6102 // ms6102 //
@source:jaleco/ms32.cpp @source:jaleco/ms32.cpp

View File

@ -130,11 +130,19 @@ cbm/plus4.cpp
cbm/vic10.cpp cbm/vic10.cpp
cbm/vic20.cpp cbm/vic20.cpp
cccp/argo.cpp cccp/argo.cpp
cccp/bk.cpp
cccp/cm1800.cpp cccp/cm1800.cpp
cccp/debut.cpp cccp/debut.cpp
cccp/dvk_kcgd.cpp
cccp/dvk_ksm.cpp
cccp/im01.cpp
cccp/intellect02.cpp cccp/intellect02.cpp
cccp/lviv.cpp cccp/lviv.cpp
cccp/mikro80.cpp cccp/mikro80.cpp
cccp/mk85.cpp
cccp/mk90.cpp
cccp/mk98.cpp
cccp/ms6102.cpp
cccp/okean240.cpp cccp/okean240.cpp
cccp/pk8000.cpp cccp/pk8000.cpp
cccp/pk8020.cpp cccp/pk8020.cpp
@ -216,14 +224,6 @@ elektor/ec65.cpp
elektor/elekscmp.cpp elektor/elekscmp.cpp
elektor/junior.cpp elektor/junior.cpp
elektron/elektronmono.cpp elektron/elektronmono.cpp
elektronika/bk.cpp
elektronika/dvk_kcgd.cpp
elektronika/dvk_ksm.cpp
elektronika/im01.cpp
elektronika/mk85.cpp
elektronika/mk90.cpp
elektronika/mk98.cpp
elektronika/ms6102.cpp
emusys/emax.cpp emusys/emax.cpp
emusys/emu2.cpp emusys/emu2.cpp
emusys/emu3.cpp emusys/emu3.cpp