Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-27 18:53:05 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge tag 'mame0187'

Browse Source 
MAME 0.187

Conflicts:
	src/mame/drivers/socrates.cpp
This commit is contained in:
Vas Crabb 2017-06-28 12:07:02 +10:00
commit c05cf76d0f
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android-project/app/src/main/AndroidManifest.xml
View File

@ -4,8 +4,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="org.mamedev.mame"
android:versionCode="186"
android:versionName="0.186"
android:versionCode="187"
android:versionName="0.187"
android:installLocation="auto">
<!-- Android 5.0 -->

4
makefile
View File

@ -1546,14 +1546,14 @@ endif
ifeq (posix,$(SHELLTYPE))
$(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS)
@echo '#define BARE_BUILD_VERSION "0.186"' > $@
@echo '#define BARE_BUILD_VERSION "0.187"' > $@
@echo 'extern const char bare_build_version[];' >> $@
@echo 'extern const char build_version[];' >> $@
@echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@
@echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@
else
$(GENDIR)/version.cpp: $(GENDIR)/git_desc
@echo #define BARE_BUILD_VERSION "0.186" > $@
@echo #define BARE_BUILD_VERSION "0.187" > $@
@echo extern const char bare_build_version[]; >> $@
@echo extern const char build_version[]; >> $@
@echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@

2
src/mame/drivers/socrates.cpp
View File

@ -80,9 +80,9 @@ TODO:
******************************************************************************/
/* Core includes */
#include "emu.h"
#include "audio/socrates.h"
#include "cpu/z80/z80.h"
#include "bus/generic/carts.h"

2
src/tools/unidasm.cpp
View File

@ -274,7 +274,7 @@ static const dasm_table_entry dasm_table[] =
// { "h8", _16be, 0, CPU_DISASSEMBLE_NAME(h8) },
// { "h8_24", _16be, 0, CPU_DISASSEMBLE_NAME(h8_24) },
// { "h8_32", _16be, 0, CPU_DISASSEMBLE_NAME(h8_32) },
{ "hc11", _8bit, 0, CPU_DISASSEMBLE_NAME(mb88) },
{ "hc11", _8bit, 0, CPU_DISASSEMBLE_NAME(hc11) },
{ "hcd62121", _8bit, 0, CPU_DISASSEMBLE_NAME(hcd62121) },
{ "hd61700", _8bit, 0, CPU_DISASSEMBLE_NAME(hd61700) },
{ "hd6301", _8bit, 0, CPU_DISASSEMBLE_NAME(hd6301) },