Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Removed the various HAS_xxxx for sound cores. To select sound cores,

Browse Source 
just choose them in the make system. Further granularity is not
necessary. This also means that the samples core is always required.
This commit is contained in:
Aaron Giles 2010-01-02 20:21:00 +00:00
parent 4935467518
commit 3df8953bca
7 changed files with 13 additions and 164 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
makefile
View File

@ -492,7 +492,7 @@ include $(SRC)/build/build.mak
include $(SRC)/tools/tools.mak include $(SRC)/tools/tools.mak
# combine the various definitions to one # combine the various definitions to one
CDEFS = $(DEFS) $(COREDEFS) $(SOUNDDEFS) CDEFS = $(DEFS)

4
src/emu/audit.c
View File

@ -146,11 +146,10 @@ int audit_images(core_options *options, const game_driver *gamedrv, UINT32 valid
int audit_samples(core_options *options, const game_driver *gamedrv, audit_record **audit) int audit_samples(core_options *options, const game_driver *gamedrv, audit_record **audit)
{ {
int records = 0;
#if HAS_SAMPLES
machine_config *config = machine_config_alloc(gamedrv->machine_config); machine_config *config = machine_config_alloc(gamedrv->machine_config);
const device_config *device; const device_config *device;
audit_record *record; audit_record *record;
int records = 0;
int sampnum; int sampnum;
/* count the number of sample records attached to this driver */ /* count the number of sample records attached to this driver */
@ -223,7 +222,6 @@ int audit_samples(core_options *options, const game_driver *gamedrv, audit_recor
skip: skip:
machine_config_free(config); machine_config_free(config);
#endif /* HAS_SAMPLES */
return records; return records;
} }

5
src/emu/clifront.c
View File

@ -593,8 +593,6 @@ int cli_info_listroms(core_options *options, const char *gamename)
int cli_info_listsamples(core_options *options, const char *gamename) int cli_info_listsamples(core_options *options, const char *gamename)
{ {
int count = 0; int count = 0;
#if (HAS_SAMPLES)
int drvindex; int drvindex;
/* since we expand the machine driver, we need to set things up */ /* since we expand the machine driver, we need to set things up */
@ -626,9 +624,6 @@ int cli_info_listsamples(core_options *options, const char *gamename)
/* clean up our tracked resources */ /* clean up our tracked resources */
exit_resource_tracking(); exit_resource_tracking();
#else
mame_printf_error("Samples not supported in this build\n");
#endif
return (count > 0) ? MAMERR_NONE : MAMERR_NO_SUCH_GAME; return (count > 0) ? MAMERR_NONE : MAMERR_NO_SUCH_GAME;
} }

4
src/emu/info.c
View File

@ -551,7 +551,6 @@ static void print_game_rom(FILE *out, const game_driver *game, const machine_con
static void print_game_sampleof(FILE *out, const game_driver *game, const machine_config *config) static void print_game_sampleof(FILE *out, const game_driver *game, const machine_config *config)
{ {
#if (HAS_SAMPLES)
const device_config *device; const device_config *device;
for (device = sound_first(config); device != NULL; device = sound_next(device)) for (device = sound_first(config); device != NULL; device = sound_next(device))
@ -573,7 +572,6 @@ static void print_game_sampleof(FILE *out, const game_driver *game, const machin
} }
} }
} }
#endif
} }
@ -584,7 +582,6 @@ static void print_game_sampleof(FILE *out, const game_driver *game, const machin
static void print_game_sample(FILE *out, const game_driver *game, const machine_config *config) static void print_game_sample(FILE *out, const game_driver *game, const machine_config *config)
{ {
#if (HAS_SAMPLES)
const device_config *device; const device_config *device;
/* iterate over sound chips looking for samples */ /* iterate over sound chips looking for samples */
@ -618,7 +615,6 @@ static void print_game_sample(FILE *out, const game_driver *game, const machine_
} }
} }
} }
#endif
} }

12
src/emu/sound/fm.h
View File

@ -9,12 +9,12 @@
#define __FM_H__ #define __FM_H__
/* --- select emulation chips --- */ /* --- select emulation chips --- */
#define BUILD_YM2203 (HAS_YM2203) /* build YM2203(OPN) emulator */ #define BUILD_YM2203 (1) /* build YM2203(OPN) emulator */
#define BUILD_YM2608 (HAS_YM2608) /* build YM2608(OPNA) emulator */ #define BUILD_YM2608 (1) /* build YM2608(OPNA) emulator */
#define BUILD_YM2610 (HAS_YM2610) /* build YM2610(OPNB) emulator */ #define BUILD_YM2610 (1) /* build YM2610(OPNB) emulator */
#define BUILD_YM2610B (HAS_YM2610B) /* build YM2610B(OPNB?)emulator */ #define BUILD_YM2610B (1) /* build YM2610B(OPNB?)emulator */
#define BUILD_YM2612 (HAS_YM2612) /* build YM2612(OPN2) emulator */ #define BUILD_YM2612 (1) /* build YM2612(OPN2) emulator */
#define BUILD_YM3438 (HAS_YM3438) /* build YM3438(OPN) emulator */ #define BUILD_YM3438 (1) /* build YM3438(OPN) emulator */
/* select bit size of output : 8 or 16 */ /* select bit size of output : 8 or 16 */
#define FM_SAMPLE_BITS 16 #define FM_SAMPLE_BITS 16

6
src/emu/sound/fmopl.h
View File

@ -4,9 +4,9 @@
#define __FMOPL_H__ #define __FMOPL_H__
/* --- select emulation chips --- */ /* --- select emulation chips --- */
#define BUILD_YM3812 (HAS_YM3812) #define BUILD_YM3812 (1)
#define BUILD_YM3526 (HAS_YM3526) #define BUILD_YM3526 (1)
#define BUILD_Y8950 (HAS_Y8950) #define BUILD_Y8950 (1)
/* select output bits size of output : 8 or 16 */ /* select output bits size of output : 8 or 16 */
#define OPL_SAMPLE_BITS 16 #define OPL_SAMPLE_BITS 16

144
src/emu/sound/sound.mak
View File

@ -15,14 +15,10 @@ SOUNDOBJ = $(EMUOBJ)/sound
#------------------------------------------------- #-------------------------------------------------
# Core sound types # Core sound types; samples always required
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_SAMPLES=$(if $(filter SAMPLES,$(SOUNDS)),1,0)
ifneq ($(filter SAMPLES,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/samples.o SOUNDOBJS += $(SOUNDOBJ)/samples.o
endif
@ -30,11 +26,6 @@ endif
# DACs # DACs
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_DAC=$(if $(filter DAC,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_DMADAC=$(if $(filter DMADAC,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_SPEAKER=$(if $(filter SPEAKER,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_BEEP=$(if $(filter BEEP,$(SOUNDS)),1,0)
ifneq ($(filter DAC,$(SOUNDS)),) ifneq ($(filter DAC,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/dac.o SOUNDOBJS += $(SOUNDOBJ)/dac.o
endif endif
@ -57,8 +48,6 @@ endif
# CD audio # CD audio
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_CDDA=$(if $(filter CDDA,$(SOUNDS)),1,0)
ifneq ($(filter CDDA,$(SOUNDS)),) ifneq ($(filter CDDA,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/cdda.o SOUNDOBJS += $(SOUNDOBJ)/cdda.o
endif endif
@ -69,8 +58,6 @@ endif
# Discrete component audio # Discrete component audio
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_DISCRETE=$(if $(filter DISCRETE,$(SOUNDS)),1,0)
ifneq ($(filter DISCRETE,$(SOUNDS)),) ifneq ($(filter DISCRETE,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/discrete.o SOUNDOBJS += $(SOUNDOBJ)/discrete.o
endif endif
@ -90,9 +77,6 @@ $(SOUNDOBJ)/discrete.o: $(SOUNDSRC)/discrete.c \
# Atari custom sound chips # Atari custom sound chips
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_POKEY=$(if $(filter POKEY,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_TIA=$(if $(filter TIA,$(SOUNDS)),1,0)
ifneq ($(filter POKEY,$(SOUNDS)),) ifneq ($(filter POKEY,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/pokey.o SOUNDOBJS += $(SOUNDOBJ)/pokey.o
endif endif
@ -107,8 +91,6 @@ endif
# Bally Astrocade sound system # Bally Astrocade sound system
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_ASTROCADE=$(if $(filter ASTROCADE,$(SOUNDS)),1,0)
ifneq ($(filter ASTROCADE,$(SOUNDS)),) ifneq ($(filter ASTROCADE,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/astrocde.o SOUNDOBJS += $(SOUNDOBJ)/astrocde.o
endif endif
@ -119,8 +101,6 @@ endif
# CEM 3394 analog synthesizer chip # CEM 3394 analog synthesizer chip
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_CEM3394=$(if $(filter CEM3394,$(SOUNDS)),1,0)
ifneq ($(filter CEM3394,$(SOUNDS)),) ifneq ($(filter CEM3394,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/cem3394.o SOUNDOBJS += $(SOUNDOBJ)/cem3394.o
endif endif
@ -131,8 +111,6 @@ endif
# Data East custom sound chips # Data East custom sound chips
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_BSMT2000=$(if $(filter BSMT2000,$(SOUNDS)),1,0)
ifneq ($(filter BSMT2000,$(SOUNDS)),) ifneq ($(filter BSMT2000,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/bsmt2000.o SOUNDOBJS += $(SOUNDOBJ)/bsmt2000.o
endif endif
@ -143,8 +121,6 @@ endif
# Ensoniq 5503 (Apple IIgs) # Ensoniq 5503 (Apple IIgs)
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_ES5503=$(if $(filter ES5503,$(SOUNDS)),1,0)
ifneq ($(filter ES5503,$(SOUNDS)),) ifneq ($(filter ES5503,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/es5503.o SOUNDOBJS += $(SOUNDOBJ)/es5503.o
endif endif
@ -155,9 +131,6 @@ endif
# Ensoniq 5505/5506 # Ensoniq 5505/5506
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_ES5505=$(if $(filter ES5505,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_ES5506=$(if $(filter ES5506,$(SOUNDS)),1,0)
ifneq ($(filter ES5505 ES5506,$(SOUNDS)),) ifneq ($(filter ES5505 ES5506,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/es5506.o SOUNDOBJS += $(SOUNDOBJ)/es5506.o
endif endif
@ -168,8 +141,6 @@ endif
# Excellent Systems ADPCM sound chip # Excellent Systems ADPCM sound chip
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_ES8712=$(if $(filter ES8712,$(SOUNDS)),1,0)
ifneq ($(filter ES8712,$(SOUNDS)),) ifneq ($(filter ES8712,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/es8712.o SOUNDOBJS += $(SOUNDOBJ)/es8712.o
endif endif
@ -180,9 +151,6 @@ endif
# Gaelco custom sound chips # Gaelco custom sound chips
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_GAELCO_CG1V=$(if $(filter GAELCO_CG1V,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_GAELCO_GAE1=$(if $(filter GAELCO_GAE1,$(SOUNDS)),1,0)
ifneq ($(filter GAELCO_CG1V,$(SOUNDS)),) ifneq ($(filter GAELCO_CG1V,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/gaelco.o SOUNDOBJS += $(SOUNDOBJ)/gaelco.o
endif endif
@ -197,8 +165,6 @@ endif
# RCA CDP1863 # RCA CDP1863
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_CDP1863=$(if $(filter CDP1863,$(SOUNDS)),1,0)
ifneq ($(filter CDP1863,$(SOUNDS)),) ifneq ($(filter CDP1863,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/cdp1863.o SOUNDOBJS += $(SOUNDOBJ)/cdp1863.o
endif endif
@ -209,8 +175,6 @@ endif
# RCA CDP1864 # RCA CDP1864
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_CDP1864=$(if $(filter CDP1864,$(SOUNDS)),1,0)
ifneq ($(filter CDP1864,$(SOUNDS)),) ifneq ($(filter CDP1864,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/cdp1864.o SOUNDOBJS += $(SOUNDOBJ)/cdp1864.o
endif endif
@ -221,8 +185,6 @@ endif
# RCA CDP1869 # RCA CDP1869
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_CDP1869=$(if $(filter CDP1869,$(SOUNDS)),1,0)
ifneq ($(filter CDP1869,$(SOUNDS)),) ifneq ($(filter CDP1869,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/cdp1869.o SOUNDOBJS += $(SOUNDOBJ)/cdp1869.o
endif endif
@ -233,8 +195,6 @@ endif
# GI AY-8910 # GI AY-8910
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_AY8910=$(if $(filter AY8910,$(SOUNDS)),1,0)
ifneq ($(filter AY8910,$(SOUNDS)),) ifneq ($(filter AY8910,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/ay8910.o SOUNDOBJS += $(SOUNDOBJ)/ay8910.o
endif endif
@ -245,8 +205,6 @@ endif
# Harris HC55516 CVSD # Harris HC55516 CVSD
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_HC55516=$(if $(filter HC55516,$(SOUNDS)),1,0)
ifneq ($(filter HC55516,$(SOUNDS)),) ifneq ($(filter HC55516,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/hc55516.o SOUNDOBJS += $(SOUNDOBJ)/hc55516.o
endif endif
@ -257,8 +215,6 @@ endif
# Hudsonsoft C6280 sound chip # Hudsonsoft C6280 sound chip
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_C6280=$(if $(filter C6280,$(SOUNDS)),1,0)
ifneq ($(filter C6280,$(SOUNDS)),) ifneq ($(filter C6280,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/c6280.o SOUNDOBJS += $(SOUNDOBJ)/c6280.o
endif endif
@ -269,8 +225,6 @@ endif
# ICS2115 sound chip # ICS2115 sound chip
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_ICS2115=$(if $(filter ICS2115,$(SOUNDS)),1,0)
ifneq ($(filter ICS2115,$(SOUNDS)),) ifneq ($(filter ICS2115,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/ics2115.o SOUNDOBJS += $(SOUNDOBJ)/ics2115.o
endif endif
@ -281,8 +235,6 @@ endif
# Irem custom sound chips # Irem custom sound chips
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_IREMGA20=$(if $(filter IREMGA20,$(SOUNDS)),1,0)
ifneq ($(filter IREMGA20,$(SOUNDS)),) ifneq ($(filter IREMGA20,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/iremga20.o SOUNDOBJS += $(SOUNDOBJ)/iremga20.o
endif endif
@ -293,13 +245,6 @@ endif
# Konami custom sound chips # Konami custom sound chips
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_K005289=$(if $(filter K005289,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_K007232=$(if $(filter K007232,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_K051649=$(if $(filter K051649,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_K053260=$(if $(filter K053260,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_K054539=$(if $(filter K054539,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_K056800=$(if $(filter K056800,$(SOUNDS)),1,0)
ifneq ($(filter K005289,$(SOUNDS)),) ifneq ($(filter K005289,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/k005289.o SOUNDOBJS += $(SOUNDOBJ)/k005289.o
endif endif
@ -329,13 +274,6 @@ endif
# Namco custom sound chips # Namco custom sound chips
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_NAMCO=$(if $(filter NAMCO,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_NAMCO_15XX=$(if $(filter NAMCO_15XX,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_NAMCO_CUS30=$(if $(filter NAMCO_CUS30,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_NAMCO_63701X=$(if $(filter NAMCO_63701X,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_C140=$(if $(filter C140,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_C352=$(if $(filter C352,$(SOUNDS)),1,0)
ifneq ($(filter NAMCO NAMCO_15XX NAMCO_CUS30,$(SOUNDS)),) ifneq ($(filter NAMCO NAMCO_15XX NAMCO_CUS30,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/namco.o SOUNDOBJS += $(SOUNDOBJ)/namco.o
endif endif
@ -358,8 +296,6 @@ endif
# National Semiconductor Digitalker # National Semiconductor Digitalker
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_DIGITALKER=$(if $(filter DIGITALKER,$(SOUNDS)),1,0)
ifneq ($(filter DIGITALKER,$(SOUNDS)),) ifneq ($(filter DIGITALKER,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/digitalk.o SOUNDOBJS += $(SOUNDOBJ)/digitalk.o
endif endif
@ -370,8 +306,6 @@ endif
# Nintendo custom sound chips # Nintendo custom sound chips
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_NES=$(if $(filter NES,$(SOUNDS)),1,0)
ifneq ($(filter NES,$(SOUNDS)),) ifneq ($(filter NES,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/nes_apu.o SOUNDOBJS += $(SOUNDOBJ)/nes_apu.o
endif endif
@ -382,8 +316,6 @@ endif
# NEC uPD7759 ADPCM sample player # NEC uPD7759 ADPCM sample player
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_UPD7759=$(if $(filter UPD7759,$(SOUNDS)),1,0)
ifneq ($(filter UPD7759,$(SOUNDS)),) ifneq ($(filter UPD7759,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/upd7759.o SOUNDOBJS += $(SOUNDOBJ)/upd7759.o
endif endif
@ -394,12 +326,6 @@ endif
# OKI ADPCM sample players # OKI ADPCM sample players
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_MSM5205=$(if $(filter MSM5205,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_MSM5232=$(if $(filter MSM5232,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_OKIM6376=$(if $(filter OKIM6376,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_OKIM6295=$(if $(filter OKIM6295,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_OKIM6258=$(if $(filter OKIM6258,$(SOUNDS)),1,0)
ifneq ($(filter MSM5205,$(SOUNDS)),) ifneq ($(filter MSM5205,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/msm5205.o SOUNDOBJS += $(SOUNDOBJ)/msm5205.o
endif endif
@ -426,8 +352,6 @@ endif
# Philips SAA1099 # Philips SAA1099
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_SAA1099=$(if $(filter SAA1099,$(SOUNDS)),1,0)
ifneq ($(filter SAA1099,$(SOUNDS)),) ifneq ($(filter SAA1099,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/saa1099.o SOUNDOBJS += $(SOUNDOBJ)/saa1099.o
endif endif
@ -438,8 +362,6 @@ endif
# QSound sample player # QSound sample player
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_QSOUND=$(if $(filter QSOUND,$(SOUNDS)),1,0)
ifneq ($(filter QSOUND,$(SOUNDS)),) ifneq ($(filter QSOUND,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/qsound.o SOUNDOBJS += $(SOUNDOBJ)/qsound.o
endif endif
@ -450,9 +372,6 @@ endif
# Ricoh sample players # Ricoh sample players
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_RF5C68=$(if $(filter RF5C68,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_RF5C400=$(if $(filter RF5C400,$(SOUNDS)),1,0)
ifneq ($(filter RF5C68,$(SOUNDS)),) ifneq ($(filter RF5C68,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/rf5c68.o SOUNDOBJS += $(SOUNDOBJ)/rf5c68.o
endif endif
@ -467,11 +386,6 @@ endif
# Sega custom sound chips # Sega custom sound chips
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_SEGAPCM=$(if $(filter SEGAPCM,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_MULTIPCM=$(if $(filter MULTIPCM,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_SCSP=$(if $(filter SCSP,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_AICA=$(if $(filter AICA,$(SOUNDS)),1,0)
ifneq ($(filter SEGAPCM,$(SOUNDS)),) ifneq ($(filter SEGAPCM,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/segapcm.o SOUNDOBJS += $(SOUNDOBJ)/segapcm.o
endif endif
@ -489,14 +403,11 @@ SOUNDOBJS += $(SOUNDOBJ)/aica.o $(SOUNDOBJ)/aicadsp.o
endif endif
#------------------------------------------------- #-------------------------------------------------
# Seta custom sound chips # Seta custom sound chips
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_ST0016=$(if $(filter ST0016,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_NILE=$(if $(filter NILE,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_X1_010=$(if $(filter X1_010,$(SOUNDS)),1,0)
ifneq ($(filter ST0016,$(SOUNDS)),) ifneq ($(filter ST0016,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/st0016.o SOUNDOBJS += $(SOUNDOBJ)/st0016.o
endif endif
@ -515,9 +426,6 @@ endif
# SID custom sound chips # SID custom sound chips
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_SID6581=$(if $(filter SID6581,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_SID8580=$(if $(filter SID8580,$(SOUNDS)),1,0)
ifneq ($(filter SID6581,$(SOUNDS)),) ifneq ($(filter SID6581,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/sid6581.o $(SOUNDOBJ)/sid.o $(SOUNDOBJ)/sidenvel.o $(SOUNDOBJ)/sidvoice.o SOUNDOBJS += $(SOUNDOBJ)/sid6581.o $(SOUNDOBJ)/sid.o $(SOUNDOBJ)/sidenvel.o $(SOUNDOBJ)/sidvoice.o
endif endif
@ -532,8 +440,6 @@ endif
# SNK(?) custom stereo sn76489a clone # SNK(?) custom stereo sn76489a clone
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_T6W28=$(if $(filter T6W28,$(SOUNDS)),1,0)
ifneq ($(filter T6W28,$(SOUNDS)),) ifneq ($(filter T6W28,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/t6w28.o SOUNDOBJS += $(SOUNDOBJ)/t6w28.o
endif endif
@ -544,8 +450,6 @@ endif
# SNK custom wave generator # SNK custom wave generator
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_SNKWAVE=$(if $(filter SNKWAVE,$(SOUNDS)),1,0)
ifneq ($(filter SNKWAVE,$(SOUNDS)),) ifneq ($(filter SNKWAVE,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/snkwave.o SOUNDOBJS += $(SOUNDOBJ)/snkwave.o
endif endif
@ -556,8 +460,6 @@ endif
# Sony custom sound chips # Sony custom sound chips
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_PSXSPU=$(if $(filter PSXSPU,$(SOUNDS)),1,0)
ifneq ($(filter PSXSPU,$(SOUNDS)),) ifneq ($(filter PSXSPU,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/psx.o SOUNDOBJS += $(SOUNDOBJ)/psx.o
endif endif
@ -568,8 +470,6 @@ endif
# SP0256 speech synthesizer # SP0256 speech synthesizer
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_SP0256=$(if $(filter SP0256,$(SOUNDS)),1,0)
ifneq ($(filter SP0256,$(SOUNDS)),) ifneq ($(filter SP0256,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/sp0256.o SOUNDOBJS += $(SOUNDOBJ)/sp0256.o
endif endif
@ -580,8 +480,6 @@ endif
# SP0250 speech synthesizer # SP0250 speech synthesizer
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_SP0250=$(if $(filter SP0250,$(SOUNDS)),1,0)
ifneq ($(filter SP0250,$(SOUNDS)),) ifneq ($(filter SP0250,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/sp0250.o SOUNDOBJS += $(SOUNDOBJ)/sp0250.o
endif endif
@ -591,8 +489,6 @@ endif
# S14001A speech synthesizer # S14001A speech synthesizer
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_S14001A=$(if $(filter S14001A,$(SOUNDS)),1,0)
ifneq ($(filter S14001A,$(SOUNDS)),) ifneq ($(filter S14001A,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/s14001a.o SOUNDOBJS += $(SOUNDOBJ)/s14001a.o
endif endif
@ -601,8 +497,6 @@ endif
# Texas Instruments SN76477 analog chip # Texas Instruments SN76477 analog chip
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_SN76477=$(if $(filter SN76477,$(SOUNDS)),1,0)
ifneq ($(filter SN76477,$(SOUNDS)),) ifneq ($(filter SN76477,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/sn76477.o SOUNDOBJS += $(SOUNDOBJ)/sn76477.o
endif endif
@ -613,8 +507,6 @@ endif
# Texas Instruments SN76496 # Texas Instruments SN76496
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_SN76496=$(if $(filter SN76496,$(SOUNDS)),1,0)
ifneq ($(filter SN76496,$(SOUNDS)),) ifneq ($(filter SN76496,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/sn76496.o SOUNDOBJS += $(SOUNDOBJ)/sn76496.o
endif endif
@ -625,8 +517,6 @@ endif
# Texas Instruments TMS36xx doorbell chime # Texas Instruments TMS36xx doorbell chime
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_TMS36XX=$(if $(filter TMS36XX,$(SOUNDS)),1,0)
ifneq ($(filter TMS36XX,$(SOUNDS)),) ifneq ($(filter TMS36XX,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/tms36xx.o SOUNDOBJS += $(SOUNDOBJ)/tms36xx.o
endif endif
@ -637,8 +527,6 @@ endif
# Texas Instruments TMS3615 Octave Multiple Tone Synthesizer # Texas Instruments TMS3615 Octave Multiple Tone Synthesizer
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_TMS3615=$(if $(filter TMS3615,$(SOUNDS)),1,0)
ifneq ($(filter TMS3615,$(SOUNDS)),) ifneq ($(filter TMS3615,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/tms3615.o SOUNDOBJS += $(SOUNDOBJ)/tms3615.o
endif endif
@ -649,9 +537,6 @@ endif
# Texas Instruments TMS5110 speech synthesizers # Texas Instruments TMS5110 speech synthesizers
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_TMS5110=$(if $(filter TMS5110,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_TMS5220=$(if $(filter TMS5220,$(SOUNDS)),1,0)
ifneq ($(filter TMS5110,$(SOUNDS)),) ifneq ($(filter TMS5110,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/tms5110.o SOUNDOBJS += $(SOUNDOBJ)/tms5110.o
endif endif
@ -666,8 +551,6 @@ endif
# VLM5030 speech synthesizer # VLM5030 speech synthesizer
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_VLM5030=$(if $(filter VLM5030,$(SOUNDS)),1,0)
ifneq ($(filter VLM5030,$(SOUNDS)),) ifneq ($(filter VLM5030,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/vlm5030.o SOUNDOBJS += $(SOUNDOBJ)/vlm5030.o
endif endif
@ -678,8 +561,6 @@ endif
# Votrax speech synthesizer # Votrax speech synthesizer
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_VOTRAX=$(if $(filter VOTRAX,$(SOUNDS)),1,0)
ifneq ($(filter VOTRAX,$(SOUNDS)),) ifneq ($(filter VOTRAX,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/votrax.o $(SOUNDOBJ)/samples.o SOUNDOBJS += $(SOUNDOBJ)/votrax.o $(SOUNDOBJ)/samples.o
endif endif
@ -690,8 +571,6 @@ endif
# VRender0 custom sound chip # VRender0 custom sound chip
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_VRENDER0=$(if $(filter VRENDER0,$(SOUNDS)),1,0)
ifneq ($(filter VRENDER0,$(SOUNDS)),) ifneq ($(filter VRENDER0,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/vrender0.o SOUNDOBJS += $(SOUNDOBJ)/vrender0.o
endif endif
@ -702,8 +581,6 @@ endif
# WAVE file (used for MESS cassette) # WAVE file (used for MESS cassette)
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_WAVE=$(if $(filter WAVE,$(SOUNDS)),1,0)
ifneq ($(filter WAVE,$(SOUNDS)),) ifneq ($(filter WAVE,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/wave.o SOUNDOBJS += $(SOUNDOBJ)/wave.o
endif endif
@ -714,21 +591,6 @@ endif
# Yamaha FM synthesizers # Yamaha FM synthesizers
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_YM2151=$(if $(filter YM2151,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_YM2203=$(if $(filter YM2203,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_YM2413=$(if $(filter YM2413,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_YM2608=$(if $(filter YM2608,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_YM2610=$(if $(filter YM2610,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_YM2610B=$(if $(filter YM2610B,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_YM2612=$(if $(filter YM2612,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_YM3438=$(if $(filter YM3438,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_YM3812=$(if $(filter YM3812,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_YM3526=$(if $(filter YM3526,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_Y8950=$(if $(filter Y8950,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_YMF262=$(if $(filter YMF262,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_YMF271=$(if $(filter YMF271,$(SOUNDS)),1,0)
SOUNDDEFS += -DHAS_YMF278B=$(if $(filter YMF278B,$(SOUNDS)),1,0)
ifneq ($(filter YM2151,$(SOUNDS)),) ifneq ($(filter YM2151,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/2151intf.o $(SOUNDOBJ)/ym2151.o SOUNDOBJS += $(SOUNDOBJ)/2151intf.o $(SOUNDOBJ)/ym2151.o
endif endif
@ -783,8 +645,6 @@ endif
# Yamaha YMZ280B ADPCM # Yamaha YMZ280B ADPCM
#------------------------------------------------- #-------------------------------------------------
SOUNDDEFS += -DHAS_YMZ280B=$(if $(filter YMZ280B,$(SOUNDS)),1,0)
ifneq ($(filter YMZ280B,$(SOUNDS)),) ifneq ($(filter YMZ280B,$(SOUNDS)),)
SOUNDOBJS += $(SOUNDOBJ)/ymz280b.o SOUNDOBJS += $(SOUNDOBJ)/ymz280b.o
endif endif