diff options
author | 2013-07-18 18:16:07 +0000 | |
---|---|---|
committer | 2013-07-18 18:16:07 +0000 | |
commit | 12d8c005a7974c9c764145bdfe2608a8278916b7 (patch) | |
tree | 193c7a360b6f2be5e8b7935b899e7eecd4ca3352 /src | |
parent | 37c657f80c4c77997f600f6a2e2dd4e6f1d0381b (diff) |
Assorted code fixes including fixing some m6502 related compiler output, adding a missing dependency for YM3526 and a text change to the "RETURN" menu line. [MAMESICK]
Diffstat (limited to 'src')
-rw-r--r-- | src/emu/cpu/cpu.mak | 20 | ||||
-rwxr-xr-x | src/emu/cpu/m6502/m6502make.py | 2 | ||||
-rw-r--r-- | src/emu/sound/sound.mak | 2 | ||||
-rw-r--r-- | src/emu/uimenu.c | 2 |
4 files changed, 13 insertions, 13 deletions
diff --git a/src/emu/cpu/cpu.mak b/src/emu/cpu/cpu.mak index 04dbc243c5a..c5e107d8309 100644 --- a/src/emu/cpu/cpu.mak +++ b/src/emu/cpu/cpu.mak @@ -1211,43 +1211,43 @@ $(CPUOBJ)/m6502/m5074x.o: $(CPUSRC)/m6502/m5074x.c \ # rule to generate the C files $(CPUOBJ)/m6502/deco16.inc: $(CPUSRC)/m6502/m6502make.py $(CPUSRC)/m6502/odeco16.lst $(CPUSRC)/m6502/ddeco16.lst - @echo Generating DECO16 source file... + @echo Generating deco16 source file... $(PYTHON) $(CPUSRC)/m6502/m6502make.py deco16_device $(CPUSRC)/m6502/odeco16.lst $(CPUSRC)/m6502/ddeco16.lst $@ $(CPUOBJ)/m6502/m4510.inc: $(CPUSRC)/m6502/m6502make.py $(CPUSRC)/m6502/om4510.lst $(CPUSRC)/m6502/dm4510.lst - @echo Generating M4510 source file... + @echo Generating m4510 source file... $(PYTHON) $(CPUSRC)/m6502/m6502make.py m4510_device $(CPUSRC)/m6502/om4510.lst $(CPUSRC)/m6502/dm4510.lst $@ $(CPUOBJ)/m6502/m6502.inc: $(CPUSRC)/m6502/m6502make.py $(CPUSRC)/m6502/om6502.lst $(CPUSRC)/m6502/dm6502.lst - @echo Generating M6502 source file... + @echo Generating m6502 source file... $(PYTHON) $(CPUSRC)/m6502/m6502make.py m6502_device $(CPUSRC)/m6502/om6502.lst $(CPUSRC)/m6502/dm6502.lst $@ $(CPUOBJ)/m6502/m65c02.inc: $(CPUSRC)/m6502/m6502make.py $(CPUSRC)/m6502/om65c02.lst $(CPUSRC)/m6502/dm65c02.lst - @echo Generating M65C02 source file... + @echo Generating m65c02 source file... $(PYTHON) $(CPUSRC)/m6502/m6502make.py m65c02_device $(CPUSRC)/m6502/om65c02.lst $(CPUSRC)/m6502/dm65c02.lst $@ $(CPUOBJ)/m6502/m65ce02.inc: $(CPUSRC)/m6502/m6502make.py $(CPUSRC)/m6502/om65ce02.lst $(CPUSRC)/m6502/dm65ce02.lst - @echo Generating M65CE02 source file... + @echo Generating m65ce02 source file... $(PYTHON) $(CPUSRC)/m6502/m6502make.py m65ce02_device $(CPUSRC)/m6502/om65ce02.lst $(CPUSRC)/m6502/dm65ce02.lst $@ $(CPUOBJ)/m6502/m6509.inc: $(CPUSRC)/m6502/m6502make.py $(CPUSRC)/m6502/om6509.lst $(CPUSRC)/m6502/dm6509.lst - @echo Generating M6509 source file... + @echo Generating m6509 source file... $(PYTHON) $(CPUSRC)/m6502/m6502make.py m6509_device $(CPUSRC)/m6502/om6509.lst $(CPUSRC)/m6502/dm6509.lst $@ $(CPUOBJ)/m6502/m6510.inc: $(CPUSRC)/m6502/m6502make.py $(CPUSRC)/m6502/om6510.lst $(CPUSRC)/m6502/dm6510.lst - @echo Generating M6510 source file... + @echo Generating m6510 source file... $(PYTHON) $(CPUSRC)/m6502/m6502make.py m6510_device $(CPUSRC)/m6502/om6510.lst $(CPUSRC)/m6502/dm6510.lst $@ $(CPUOBJ)/m6502/n2a03.inc: $(CPUSRC)/m6502/m6502make.py $(CPUSRC)/m6502/on2a03.lst $(CPUSRC)/m6502/dn2a03.lst - @echo Generating N2A03 source file... + @echo Generating n2a03 source file... $(PYTHON) $(CPUSRC)/m6502/m6502make.py n2a03_device $(CPUSRC)/m6502/on2a03.lst $(CPUSRC)/m6502/dn2a03.lst $@ $(CPUOBJ)/m6502/r65c02.inc: $(CPUSRC)/m6502/m6502make.py $(CPUSRC)/m6502/dr65c02.lst - @echo Generating R65C02 source file... + @echo Generating r65c02 source file... $(PYTHON) $(CPUSRC)/m6502/m6502make.py r65c02_device - $(CPUSRC)/m6502/dr65c02.lst $@ $(CPUOBJ)/m6502/m740.inc: $(CPUSRC)/m6502/m6502make.py $(CPUSRC)/m6502/om740.lst $(CPUSRC)/m6502/dm740.lst - @echo Generating M740 source file... + @echo Generating m740 source file... $(PYTHON) $(CPUSRC)/m6502/m6502make.py m740_device $(CPUSRC)/m6502/om740.lst $(CPUSRC)/m6502/dm740.lst $@ #------------------------------------------------- diff --git a/src/emu/cpu/m6502/m6502make.py b/src/emu/cpu/m6502/m6502make.py index 46a2022889d..8061780364f 100755 --- a/src/emu/cpu/m6502/m6502make.py +++ b/src/emu/cpu/m6502/m6502make.py @@ -236,7 +236,7 @@ def save(fname, device, opcodes, states): def main(argv): - debug = True + debug = False logformat=("%(levelname)s:" "%(module)s:" "%(lineno)d:" diff --git a/src/emu/sound/sound.mak b/src/emu/sound/sound.mak index c13e44750b9..8a493d75052 100644 --- a/src/emu/sound/sound.mak +++ b/src/emu/sound/sound.mak @@ -820,7 +820,7 @@ SOUNDOBJS += $(SOUNDOBJ)/3812intf.o $(SOUNDOBJ)/fmopl.o $(SOUNDOBJ)/ymdeltat.o endif ifneq ($(filter YM3526,$(SOUNDS)),) -SOUNDOBJS += $(SOUNDOBJ)/3526intf.o $(SOUNDOBJ)/fmopl.o +SOUNDOBJS += $(SOUNDOBJ)/3526intf.o $(SOUNDOBJ)/fmopl.o $(SOUNDOBJ)/ymdeltat.o endif ifneq ($(filter Y8950,$(SOUNDS)),) diff --git a/src/emu/uimenu.c b/src/emu/uimenu.c index 3265976c7b4..6dbe0f0d50b 100644 --- a/src/emu/uimenu.c +++ b/src/emu/uimenu.c @@ -188,7 +188,7 @@ void ui_menu::reset(ui_menu_reset_options options) else if (parent->is_special_main_menu()) item_append("Exit", NULL, 0, NULL); else - item_append("Return to Prior Menu", NULL, 0, NULL); + item_append("Return to Previous Menu", NULL, 0, NULL); } |