diff options
author | 2021-04-28 15:01:00 +1000 | |
---|---|---|
committer | 2021-04-28 15:01:00 +1000 | |
commit | 79339c28ab85e4dc0f675b7919b0f7c3232a0903 (patch) | |
tree | 2762184d4e4c54c9a3aeed1517dfdad6b4aa170f | |
parent | c7733046891795d7b7f19c37aaf66217581f0eab (diff) | |
parent | 1f2211366135e116c4a92aa2f49b9b81184a8726 (diff) |
Merge tag 'mame0231' into mainline-master
MAME 0.231
-rw-r--r-- | android-project/app/src/main/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | docs/source/initialsetup/compilingmame.rst | 2 | ||||
-rw-r--r-- | makefile | 4 | ||||
-rw-r--r-- | src/mame/drivers/apple2.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/dai3wksi.cpp | 2 | ||||
-rw-r--r-- | src/mame/drivers/namcos11.cpp | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index fd34954db6e..b82fd81108f 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.mamedev.mame" - android:versionCode="230" - android:versionName="0.230" + android:versionCode="231" + android:versionName="0.231" android:installLocation="auto"> <!-- OpenGL ES 2.0 --> diff --git a/docs/source/initialsetup/compilingmame.rst b/docs/source/initialsetup/compilingmame.rst index 77b1c51f9cc..4f4b6a0615a 100644 --- a/docs/source/initialsetup/compilingmame.rst +++ b/docs/source/initialsetup/compilingmame.rst @@ -217,7 +217,7 @@ Fedora Linux You’ll need a few prerequisites from your Linux distribution. Make sure you get SDL2 2.0.4 or later as earlier versions are buggy:: - sudo dnf install gcc gcc-c++ SDL2-devel SDL2_ttf-devel libXi-devel libXinerama-devel qt5-qtbase-devel qt5-qttools expat-devel fontconfig-devel alsa-lib-devel + sudo dnf install gcc gcc-c++ SDL2-devel SDL2_ttf-devel libXi-devel libXinerama-devel qt5-qtbase-devel qt5-qttools expat-devel fontconfig-devel alsa-lib-devel pulseaudio-libs-devel Compilation is exactly as described above in All Platforms. @@ -1755,14 +1755,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.230"' > $@ + @echo '#define BARE_BUILD_VERSION "0.231"' > $@ @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: makefile $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo #define BARE_BUILD_VERSION "0.230" > $@ + @echo #define BARE_BUILD_VERSION "0.231" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ diff --git a/src/mame/drivers/apple2.cpp b/src/mame/drivers/apple2.cpp index e9058325177..271428ef5b4 100644 --- a/src/mame/drivers/apple2.cpp +++ b/src/mame/drivers/apple2.cpp @@ -1822,7 +1822,7 @@ COMP( 1982, microeng, apple2, 0, apple2p, apple2p, apple2_state, empty_ini COMP( 1982, maxxi, apple2, 0, apple2p, apple2p, apple2_state, empty_init, "Polymax", "Maxxi", MACHINE_SUPPORTS_SAVE ) COMP( 1982, prav82, apple2, 0, apple2p, apple2p, apple2_state, empty_init, "Pravetz", "Pravetz 82", MACHINE_SUPPORTS_SAVE ) COMP( 1982, ace100, apple2, 0, apple2, apple2p, apple2_state, empty_init, "Franklin Computer", "Franklin Ace 100", MACHINE_SUPPORTS_SAVE ) -COMP( 1982, ace1000, apple2, 0, apple2p, apple2p, apple2_state, empty_init, "Franklin Computer", "Franklin ACE 1000", MACHINE_SUPPORTS_SAVE ) +COMP( 1982, ace1000, apple2, 0, apple2p, apple2p, apple2_state, empty_init, "Franklin Computer", "Franklin ACE 1000", MACHINE_SUPPORTS_SAVE ) COMP( 1982, uniap2en, apple2, 0, apple2p, apple2p, apple2_state, empty_init, "Unitron Eletronica", "Unitron AP II (in English)", MACHINE_SUPPORTS_SAVE ) COMP( 1982, uniap2pt, apple2, 0, apple2p, apple2p, apple2_state, empty_init, "Unitron Eletronica", "Unitron AP II (in Brazilian Portuguese)", MACHINE_SUPPORTS_SAVE ) COMP( 1984, uniap2ti, apple2, 0, apple2p, apple2p, apple2_state, empty_init, "Unitron Eletronica", "Unitron AP II+ (Teclado Inteligente)", MACHINE_SUPPORTS_SAVE ) diff --git a/src/mame/drivers/dai3wksi.cpp b/src/mame/drivers/dai3wksi.cpp index 12db34f3d76..d7f6d54be3c 100644 --- a/src/mame/drivers/dai3wksi.cpp +++ b/src/mame/drivers/dai3wksi.cpp @@ -660,4 +660,4 @@ ROM_END GAME( 1979, dai3wksi, 0, dai3wksi, dai3wksi, dai3wksi_state, empty_init, ROT270, "Sun Electronics", "Dai 3 Wakusei (Japan)", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) GAME( 1979, warp1, 0, dai3wksi, warp1, dai3wksi_state, empty_init, ROT90, "Sun Electronics (Taito license)", "Warp-1", MACHINE_IMPERFECT_COLORS | MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE ) -GAMEL(1979, warp1bl, warp1, warp1bl, warp1bl, dai3wksi_state, empty_init, ROT270, "bootleg (Igleck)", "Warp-1 (Japan bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_warp1bl ) +GAMEL(1979, warp1bl, warp1, warp1bl, warp1bl, dai3wksi_state, empty_init, ROT270, "bootleg (Igleck)", "Warp-1 (Japan, bootleg)", MACHINE_IMPERFECT_SOUND | MACHINE_SUPPORTS_SAVE, layout_warp1bl ) diff --git a/src/mame/drivers/namcos11.cpp b/src/mame/drivers/namcos11.cpp index 075070ae60d..30b0d224728 100644 --- a/src/mame/drivers/namcos11.cpp +++ b/src/mame/drivers/namcos11.cpp @@ -1798,5 +1798,5 @@ GAME( 1997, starswepj, starswep, starswep, namcos11, namcos11_state, empty_ GAME( 1998, myangel3, 0, myangel3, myangel3, namcos11_state, empty_init, ROT0, "MOSS / Namco", "Kosodate Quiz My Angel 3 (Japan, KQT1/VER.A)", 0 ) GAME( 1999, ptblank2a, ptblank2 ,ptblank2ua, ptblank2ua, namcos11_state, empty_init, ROT0, "Namco", "Point Blank 2 (World, GNB2/VER.A)", 0 ) GAME( 1999, ptblank2b, ptblank2 ,ptblank2ua, ptblank2ua, namcos11_state, empty_init, ROT0, "Namco", "Point Blank 2 (World, GNB2/VER.A alt)", 0 ) -GAME( 1999, ptblank2c, ptblank2 ,ptblank2ua, ptblank2ua, namcos11_state, empty_init, ROT0, "Namco", "Point Blank 2 (Unknown region)", 0 ) +GAME( 1999, ptblank2c, ptblank2 ,ptblank2ua, ptblank2ua, namcos11_state, empty_init, ROT0, "Namco", "Point Blank 2 (unknown region)", 0 ) GAME( 1999, ptblank2ua, ptblank2, ptblank2ua, ptblank2ua, namcos11_state, empty_init, ROT0, "Namco", "Point Blank 2 (US, GNB3/VER.A)", 0 ) |