summaryrefslogtreecommitdiffstats
path: root/src/mame
diff options
context:
space:
mode:
authorGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-10-19 05:52:41 +0000
committerGravatarGravatar Aaron Giles <aaron@aarongiles.com>2010-10-19 05:52:41 +0000
commitcf6927cb9f328c197cc7137495b43646d2f2be09 (patch) (github)
tree3836ca68756493954a57b6a63c0b29c24bf7ea68 /src/mame
parent05421623da5cd8014428679caba4195bf9f11038 (diff)
downloadmame-cf6927cb9f328c197cc7137495b43646d2f2be09.tar.bz2
mame-cf6927cb9f328c197cc7137495b43646d2f2be09.zip
Fix MT04065: tiny (and ldplayer) don't link.
This needs an unfortunate hack with a dummy driver added to seed references to the devices that are only otherwise referenced by libemu.a. Also removed SOUNDS += CUSTOM since such a sound device no longer exists.
Diffstat (limited to 'src/mame')
-rw-r--r--src/mame/mame.mak8
-rw-r--r--src/mame/tiny.mak2
2 files changed, 8 insertions, 2 deletions
diff --git a/src/mame/mame.mak b/src/mame/mame.mak
index 7694ea1b1ca..60f09620fe8 100644
--- a/src/mame/mame.mak
+++ b/src/mame/mame.mak
@@ -124,12 +124,13 @@ CPUS += SCMP
CPUS += MN10200
CPUS += COSMAC
+
+
#-------------------------------------------------
# specify available sound cores; some of these are
# only for MESS and so aren't included
#-------------------------------------------------
-SOUNDS += CUSTOM
SOUNDS += SAMPLES
SOUNDS += DAC
SOUNDS += DMADAC
@@ -227,6 +228,8 @@ SOUNDS += MOS656X
SOUNDS += S2636
#SOUNDS += ASC
+
+
#-------------------------------------------------
# this is the list of driver libraries that
# comprise MAME plus mamedriv.o which contains
@@ -1673,6 +1676,8 @@ $(MAMEOBJ)/misc.a: \
$(DRIVERS)/wldarrow.o \
$(DRIVERS)/xyonix.o $(VIDEO)/xyonix.o \
+
+
#-------------------------------------------------
# layout dependencies
#-------------------------------------------------
@@ -1901,6 +1906,7 @@ $(DRIVERS)/wecleman.o: $(LAYOUT)/wecleman.lh
$(DRIVERS)/zac2650.o: $(LAYOUT)/tinv2650.lh
+
#-------------------------------------------------
# misc dependencies
#-------------------------------------------------
diff --git a/src/mame/tiny.mak b/src/mame/tiny.mak
index dd11a7308b0..fc4e4f26613 100644
--- a/src/mame/tiny.mak
+++ b/src/mame/tiny.mak
@@ -48,7 +48,6 @@ CPUS += M680X0
# drivers referenced in tiny.c.
#-------------------------------------------------
-SOUNDS += CUSTOM
SOUNDS += SAMPLES
SOUNDS += DAC
SOUNDS += DISCRETE
@@ -71,6 +70,7 @@ SOUNDS += CEM3394
DRVLIBS = \
$(MAMEOBJ)/tiny.o \
+ $(EMUDRIVERS)/emudummy.o \
$(MACHINE)/ticket.o \
$(DRIVERS)/carpolo.o $(MACHINE)/carpolo.o $(VIDEO)/carpolo.o \
$(DRIVERS)/circus.o $(AUDIO)/circus.o $(VIDEO)/circus.o \