From 17a49a91b6ca42483cbaee1ce762a780e480dd01 Mon Sep 17 00:00:00 2001 From: Robbbert Date: Fri, 3 Dec 2021 18:54:21 +1100 Subject: [PATCH] Moved common apple2 files to the conditional "mameshared" library, to avoid duplicate symbols on a full MAME build. --- scripts/target/mame/mess.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index d5af35a4216..441521e7e3a 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -1508,6 +1508,7 @@ function createProjects_mame_mess(_target, _subtarget) -- 3do.c (MESS + MAME), konamim2.c (MAME) -- vectrex.c (MESS + MAME) -- cps1.c (MESS + MAME) +-- apple -------------------------------------------------- if (_subtarget=="mess") then createMESSProjects(_target, _subtarget, "mameshared") @@ -1629,6 +1630,10 @@ files { MAME_DIR .. "src/mame/video/saturn.cpp", MAME_DIR .. "src/mame/machine/saturn_cdb.cpp", MAME_DIR .. "src/mame/machine/saturn_cdb.h", + MAME_DIR .. "src/mame/video/apple2.cpp", + MAME_DIR .. "src/mame/video/apple2.h", + MAME_DIR .. "src/mame/machine/apple2common.cpp", + MAME_DIR .. "src/mame/machine/apple2common.h", } end -------------------------------------------------- @@ -1813,12 +1818,8 @@ files { MAME_DIR .. "src/mame/drivers/apple2.cpp", MAME_DIR .. "src/mame/drivers/apple2e.cpp", MAME_DIR .. "src/mame/includes/apple2e.h", - MAME_DIR .. "src/mame/video/apple2.cpp", - MAME_DIR .. "src/mame/video/apple2.h", MAME_DIR .. "src/mame/drivers/tk2000.cpp", MAME_DIR .. "src/mame/drivers/apple2gs.cpp", - MAME_DIR .. "src/mame/machine/apple2common.cpp", - MAME_DIR .. "src/mame/machine/apple2common.h", MAME_DIR .. "src/mame/drivers/apple3.cpp", MAME_DIR .. "src/mame/includes/apple3.h", MAME_DIR .. "src/mame/machine/apple3.cpp",