From d6cd22c5e30172238cb900b17b501180a128a9d3 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 24 Apr 2017 00:04:20 +1000 Subject: [PATCH 1/5] stupid MSVC (nw) --- src/lib/netlist/plib/pstring.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lib/netlist/plib/pstring.h b/src/lib/netlist/plib/pstring.h index ced1cdc1f22..eb7c24b938e 100644 --- a/src/lib/netlist/plib/pstring.h +++ b/src/lib/netlist/plib/pstring.h @@ -34,10 +34,12 @@ public: pstring_const_iterator() noexcept : p() { } explicit constexpr pstring_const_iterator(const typename string_type::const_iterator &x) noexcept : p(x) { } +#if !defined(_MSC_VER) || !defined(_ITERATOR_DEBUG_LEVEL) || (0 == _ITERATOR_DEBUG_LEVEL) // debug iterators are broken pstring_const_iterator(const pstring_const_iterator &rhs) noexcept = default; pstring_const_iterator(pstring_const_iterator &&rhs) noexcept = default; pstring_const_iterator &operator=(const pstring_const_iterator &rhs) noexcept = default; pstring_const_iterator &operator=(pstring_const_iterator &&rhs) noexcept = default; +#endif pstring_const_iterator& operator++() noexcept { p += static_cast(traits_type::codelen(&(*p))); return *this; } pstring_const_iterator operator++(int) noexcept { pstring_const_iterator tmp(*this); operator++(); return tmp; } From 0e739a0e4b5d8d83fffaf0a1445fc780aa19be7f Mon Sep 17 00:00:00 2001 From: Dirk Best Date: Sun, 23 Apr 2017 10:05:16 +0200 Subject: [PATCH 2/5] popper: Fix memory map, finish gfx rendering. Game is fully working again. --- src/mame/drivers/popper.cpp | 146 ++++++++++++++++++++++++++++++------ 1 file changed, 121 insertions(+), 25 deletions(-) diff --git a/src/mame/drivers/popper.cpp b/src/mame/drivers/popper.cpp index 65038e84356..eee67ad2747 100644 --- a/src/mame/drivers/popper.cpp +++ b/src/mame/drivers/popper.cpp @@ -33,7 +33,8 @@ TODO: - According to the schematics the sub CPU ROM should be 0x2000 - Verify screen raw parameters - - Finish driver + - Verify graphics with real hardware + - Watchdog ***************************************************************************/ @@ -59,16 +60,19 @@ public: m_screen(*this, "screen"), m_gfxdecode(*this, "gfxdecode"), m_ay{ {*this, "ay1"}, {*this, "ay2"} }, - m_ram(*this, "ram"), + m_video_ram(*this, "video_ram"), + m_attribute_ram(*this, "attribute_ram"), + m_sprite_ram(*this, "sprite_ram"), m_inputs{ {*this, "in1"}, {*this, "in0"}, {*this, "dsw2"}, {*this, "dsw1"} }, m_scanline_timer(nullptr), - m_tilemap(nullptr), - m_nmi_enable(0), m_vram_page(0) + m_layer0_tilemap(nullptr), m_layer1_tilemap(nullptr), + m_nmi_enable(0), m_back_color(0), m_vram_page(0) { } DECLARE_PALETTE_INIT(popper); uint32_t screen_update(screen_device &screen, bitmap_ind16 &bitmap, const rectangle &cliprect); - TILE_GET_INFO_MEMBER(tile_info); + TILE_GET_INFO_MEMBER(layer0_tile_info); + TILE_GET_INFO_MEMBER(layer1_tile_info); DECLARE_WRITE8_MEMBER(nmi_control_w); DECLARE_WRITE8_MEMBER(crt_direction_w); @@ -92,13 +96,17 @@ private: required_device m_screen; required_device m_gfxdecode; required_device m_ay[2]; - required_shared_ptr m_ram; + required_shared_ptr m_video_ram; + required_shared_ptr m_attribute_ram; + required_shared_ptr m_sprite_ram; required_ioport m_inputs[4]; emu_timer *m_scanline_timer; - tilemap_t *m_tilemap; + tilemap_t *m_layer0_tilemap; + tilemap_t *m_layer1_tilemap; int m_nmi_enable; + int m_back_color; int m_vram_page; }; @@ -110,7 +118,13 @@ private: static ADDRESS_MAP_START( main_map, AS_PROGRAM, 8, popper_state ) AM_RANGE(0x0000, 0x7fff) AM_ROM AM_RANGE(0x8000, 0xbfff) AM_NOP - AM_RANGE(0xc000, 0xdfff) AM_RAM AM_SHARE("ram") + AM_RANGE(0xc000, 0xc0ff) AM_RAM + AM_RANGE(0xc100, 0xc6ff) AM_RAM AM_SHARE("video_ram") + AM_RANGE(0xc700, 0xc8ff) AM_RAM + AM_RANGE(0xc900, 0xceff) AM_RAM AM_SHARE("attribute_ram") + AM_RANGE(0xcf00, 0xcfff) AM_RAM + AM_RANGE(0xd000, 0xd7ff) AM_RAM AM_SHARE("sprite_ram") + AM_RANGE(0xd800, 0xdfff) AM_RAM AM_SHARE("shared") AM_RANGE(0xe000, 0xe003) AM_MIRROR(0x03fc) AM_READ(inputs_r) AM_RANGE(0xe000, 0xe000) AM_MIRROR(0x1ff8) AM_WRITE(nmi_control_w) AM_RANGE(0xe001, 0xe001) AM_MIRROR(0x1ff8) AM_WRITE(crt_direction_w) @@ -128,7 +142,7 @@ static ADDRESS_MAP_START( sub_map, AS_PROGRAM, 8, popper_state ) AM_RANGE(0x2000, 0x7fff) AM_NOP AM_RANGE(0x8000, 0x8003) AM_MIRROR(0x1ffc) AM_WRITE(ay1_w) AM_RANGE(0xa000, 0xa003) AM_MIRROR(0x1ffc) AM_DEVWRITE("ay2", ay8910_device, write_bc1_bc2) - AM_RANGE(0xc000, 0xdfff) AM_RAM AM_SHARE("ram") + AM_RANGE(0xc000, 0xc7ff) AM_MIRROR(0x1800) AM_RAM AM_SHARE("shared") AM_RANGE(0xe000, 0xffff) AM_NOP ADDRESS_MAP_END @@ -288,7 +302,7 @@ WRITE8_MEMBER( popper_state::crt_direction_w ) WRITE8_MEMBER( popper_state::back_color_select_w ) { - logerror("back_color_select_w: %02x\n", data); + m_back_color = data & 1; } WRITE8_MEMBER( popper_state::vram_page_select_w ) @@ -301,10 +315,56 @@ uint32_t popper_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap bitmap.fill(0, cliprect); // always draw all tiles - m_tilemap->mark_all_dirty(); + m_layer0_tilemap->mark_all_dirty(); + m_layer1_tilemap->mark_all_dirty(); - // draw the character layer - m_tilemap->draw(screen, bitmap, cliprect, 0, 0); + // draw the layers with lower priority + m_layer0_tilemap->draw(screen, bitmap, cliprect, 0, 0); + m_layer1_tilemap->draw(screen, bitmap, cliprect, 0, 0); + + // draw the sprites + for (int offs = 0; offs < 0x800; offs += 4) + { + // 0 76653210 Y coordinate + // 1 76543210 Code + // 2 7------- Flip Y + // 2 -6------ Flip X + // 2 --54---- Not used + // 2 ----3210 Color + // 3 76653210 X coordinate + + int sx = m_sprite_ram[offs + 3]; + int sy = m_sprite_ram[offs + 0]; + + // only render sprite if it's in the current offset range + if (((sy + (flip_screen() ? 2 : 0)) >> 4) != ((~(offs >> 7)) & 0x0f)) + continue; + + sx += 64; + sy = 240 - sy; + + int flipx = BIT(m_sprite_ram[offs + 2], 6); + int flipy = BIT(m_sprite_ram[offs + 2], 7); + + if (flip_screen()) + { + flipx = !flipx; + flipy = !flipy; + + sx = 232 - sx; + sx += 128; + sy = (240 + 2) - sy; + } + + int code = m_sprite_ram[offs + 1]; + int color = m_sprite_ram[offs + 2] & 0x0f; + + m_gfxdecode->gfx(2)->transpen(bitmap, cliprect, code, color, flipx, flipy, sx, sy, 0); + } + + // draw the tiles with priority over the sprites + m_layer0_tilemap->draw(screen, bitmap, cliprect, 1, 0); + m_layer1_tilemap->draw(screen, bitmap, cliprect, 1, 0); return 0; } @@ -314,7 +374,18 @@ uint32_t popper_state::screen_update(screen_device &screen, bitmap_ind16 &bitmap // DRAWGFX LAYOUTS //************************************************************************** -static const gfx_layout charlayout = +static const gfx_layout layer0_charlayout = +{ + 8,8, + RGN_FRAC(2,2), + 1, + { 0, 4 }, + { STEP4(8,1), STEP4(0,1) }, + { STEP8(0,16) }, + 16*8 +}; + +static const gfx_layout layer1_charlayout = { 8,8, RGN_FRAC(2,2), @@ -337,19 +408,40 @@ static const gfx_layout spritelayout = }; static GFXDECODE_START( popper ) - GFXDECODE_ENTRY("tiles", 0, charlayout, 0, 16) - GFXDECODE_ENTRY("sprites", 0, spritelayout, 0, 16) + GFXDECODE_ENTRY("tiles", 0, layer0_charlayout, 0, 32) + GFXDECODE_ENTRY("tiles", 0, layer1_charlayout, 0, 16) + GFXDECODE_ENTRY("sprites", 0, spritelayout, 0, 16) GFXDECODE_END -TILE_GET_INFO_MEMBER( popper_state::tile_info ) +// attribute ram layout +// 7------- high priority +// -654---- layer0 color +// ----3210 layer1 color + +TILE_GET_INFO_MEMBER( popper_state::layer0_tile_info ) { - int code = (m_vram_page << 8) | m_ram[0x100 + tile_index]; - int attr = m_ram[0x900 + tile_index]; - int color = attr >> 4; + int code = (m_vram_page << 8) | m_video_ram[tile_index]; + int attr = m_attribute_ram[tile_index]; + int color = (~m_back_color & 1) << 3 | ((attr >> 4) & 7); + color <<= 1; + + // high priority only applies if a color is set + tileinfo.category = BIT(attr, 7) && (attr & 0x70); SET_TILE_INFO_MEMBER(0, code, color, 0); } +TILE_GET_INFO_MEMBER( popper_state::layer1_tile_info ) +{ + int code = (m_vram_page << 8) | m_video_ram[tile_index]; + int attr = m_attribute_ram[tile_index]; + int color = attr & 0x0f; + + tileinfo.category = BIT(attr, 7); + + SET_TILE_INFO_MEMBER(1, code, color, 0); +} + //************************************************************************** // SUBCPU @@ -389,26 +481,28 @@ WRITE8_MEMBER( popper_state::ay1_w ) WRITE8_MEMBER( popper_state::nmi_control_w ) { -// logerror("nmi_control_w: %02x\n", data); m_nmi_enable = data & 1; } WRITE8_MEMBER( popper_state::intcycle_w ) { + // set to 0 and apparently not used by the game logerror("intcycle_w: %d = %02x\n", offset, data); } READ8_MEMBER( popper_state::watchdog_clear_r ) { - logerror("watchdog_clear_r\n"); return 0; } void popper_state::machine_start() { - // create tilemap - m_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(popper_state::tile_info), this), TILEMAP_SCAN_COLS, 8, 8, 48, 32); - m_tilemap->set_transparent_pen(3); + // create tilemaps + m_layer0_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(popper_state::layer0_tile_info), this), TILEMAP_SCAN_COLS, 8, 8, 48, 32); + m_layer0_tilemap->set_transparent_pen(1); + + m_layer1_tilemap = &machine().tilemap().create(*m_gfxdecode, tilemap_get_info_delegate(FUNC(popper_state::layer1_tile_info), this), TILEMAP_SCAN_COLS, 8, 8, 48, 32); + m_layer1_tilemap->set_transparent_pen(0); // allocate and start scanline timer m_scanline_timer = timer_alloc(0); @@ -416,12 +510,14 @@ void popper_state::machine_start() // register for save states save_item(NAME(m_nmi_enable)); + save_item(NAME(m_back_color)); save_item(NAME(m_vram_page)); } void popper_state::machine_reset() { m_nmi_enable = 0; + m_back_color = 0; m_vram_page = 0; } From 01f17a6b05b8665c6e86bfdf06cb0b2ee28ab5fc Mon Sep 17 00:00:00 2001 From: Dirk Best Date: Sun, 23 Apr 2017 10:12:31 +0200 Subject: [PATCH 3/5] New working machine ------------------- Popper [Dirk Best] --- src/mame/drivers/popper.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/drivers/popper.cpp b/src/mame/drivers/popper.cpp index eee67ad2747..3147f514854 100644 --- a/src/mame/drivers/popper.cpp +++ b/src/mame/drivers/popper.cpp @@ -588,4 +588,4 @@ ROM_END //************************************************************************** // YEAR NAME PARENT MACHINE INPUT CLASS INIT ROTATION COMPANY FULLNAME FLAGS -GAME( 1983, popper, 0, popper, popper, driver_device, 0, ROT90, "Omori", "Popper", MACHINE_NOT_WORKING | MACHINE_SUPPORTS_SAVE ) +GAME( 1983, popper, 0, popper, popper, driver_device, 0, ROT90, "Omori", "Popper", MACHINE_SUPPORTS_SAVE ) From e089f65fcf96c1c93ba95a30419c8414b3955730 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 25 Apr 2017 13:31:45 +1000 Subject: [PATCH 4/5] cherry-pick acchi DIP switches, clean up a little (nw) --- src/mame/drivers/acchi.cpp | 88 ++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 37 deletions(-) diff --git a/src/mame/drivers/acchi.cpp b/src/mame/drivers/acchi.cpp index dd45b92231d..d2349c5d9d4 100644 --- a/src/mame/drivers/acchi.cpp +++ b/src/mame/drivers/acchi.cpp @@ -203,47 +203,61 @@ ADDRESS_MAP_END static INPUT_PORTS_START( acchi ) // inputs register in test mode but not in game mode? PORT_START("IN0") - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_SERVICE1 ) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_START2 ) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") - PORT_SERVICE( 0x0020, IP_ACTIVE_LOW ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_UNKNOWN ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_SERVICE1 ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_START2 ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Reset") + PORT_SERVICE( 0x20, IP_ACTIVE_LOW ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_UNKNOWN ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_UNKNOWN ) PORT_START("IN1") - PORT_BIT( 0x0001, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(1) - PORT_BIT( 0x0002, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(1) - PORT_BIT( 0x0004, IP_ACTIVE_LOW, IPT_JOYSTICK_DOWN ) PORT_PLAYER(2) - PORT_BIT( 0x0008, IP_ACTIVE_LOW, IPT_JOYSTICK_UP ) PORT_PLAYER(2) - PORT_BIT( 0x0010, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Hopper") - PORT_BIT( 0x0020, IP_ACTIVE_LOW, IPT_START1 ) - PORT_BIT( 0x0040, IP_ACTIVE_LOW, IPT_COIN2 ) - PORT_BIT( 0x0080, IP_ACTIVE_LOW, IPT_COIN1 ) + PORT_BIT( 0x01, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_DOWN ) + PORT_BIT( 0x02, IP_ACTIVE_LOW, IPT_JOYSTICKLEFT_UP ) + PORT_BIT( 0x04, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_DOWN ) + PORT_BIT( 0x08, IP_ACTIVE_LOW, IPT_JOYSTICKRIGHT_UP ) + PORT_BIT( 0x10, IP_ACTIVE_LOW, IPT_OTHER ) PORT_NAME("Hopper") + PORT_BIT( 0x20, IP_ACTIVE_LOW, IPT_START1 ) + PORT_BIT( 0x40, IP_ACTIVE_LOW, IPT_COIN2 ) + PORT_BIT( 0x80, IP_ACTIVE_LOW, IPT_COIN1 ) PORT_START("DSW1") - PORT_DIPNAME( 0x0001, 0x0001, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("DSW1:8") - PORT_DIPSETTING( 0x0001, DEF_STR( Off ) ) - PORT_DIPSETTING( 0x0000, DEF_STR( On ) ) - PORT_DIPUNKNOWN_DIPLOC(0x02, 0x02, "DSW1:7") - PORT_DIPUNKNOWN_DIPLOC(0x04, 0x04, "DSW1:6") - PORT_DIPUNKNOWN_DIPLOC(0x08, 0x08, "DSW1:5") - PORT_DIPUNKNOWN_DIPLOC(0x10, 0x10, "DSW1:4") - PORT_DIPUNKNOWN_DIPLOC(0x20, 0x20, "DSW1:3") - PORT_DIPUNKNOWN_DIPLOC(0x40, 0x40, "DSW1:2") - PORT_DIPUNKNOWN_DIPLOC(0x80, 0x80, "DSW1:1") + PORT_DIPNAME( 0x01, 0x01, DEF_STR( Flip_Screen ) ) PORT_DIPLOCATION("DSW1:8") + PORT_DIPSETTING( 0x01, DEF_STR( Off ) ) + PORT_DIPSETTING( 0x00, DEF_STR( On ) ) + PORT_DIPUNKNOWN_DIPLOC( 0x02, 0x02, "DSW1:7" ) + PORT_DIPUNKNOWN_DIPLOC( 0x04, 0x04, "DSW1:6" ) + PORT_DIPUNKNOWN_DIPLOC( 0x08, 0x08, "DSW1:5" ) + PORT_DIPUNKNOWN_DIPLOC( 0x10, 0x10, "DSW1:4" ) + PORT_DIPUNKNOWN_DIPLOC( 0x20, 0x20, "DSW1:3" ) + PORT_DIPUNKNOWN_DIPLOC( 0x40, 0x40, "DSW1:2" ) + PORT_DIPUNKNOWN_DIPLOC( 0x80, 0x80, "DSW1:1" ) PORT_START("DSW2") - PORT_DIPUNKNOWN_DIPLOC(0x01, 0x01, "DSW2:8") - PORT_DIPUNKNOWN_DIPLOC(0x02, 0x02, "DSW2:7") - PORT_DIPUNKNOWN_DIPLOC(0x04, 0x04, "DSW2:6") - PORT_DIPUNKNOWN_DIPLOC(0x08, 0x08, "DSW2:5") - PORT_DIPUNKNOWN_DIPLOC(0x10, 0x10, "DSW2:4") - PORT_DIPUNKNOWN_DIPLOC(0x20, 0x20, "DSW2:3") - PORT_DIPUNKNOWN_DIPLOC(0x40, 0x40, "DSW2:2") - PORT_DIPUNKNOWN_DIPLOC(0x80, 0x80, "DSW2:1") + PORT_DIPUNKNOWN_DIPLOC( 0x01, 0x01, "DSW2:8" ) + PORT_DIPNAME( 0x02, 0x02, DEF_STR( Demo_Sounds ) ) PORT_DIPLOCATION("DSW2:7") + PORT_DIPSETTING( 0x02, DEF_STR( On ) ) + PORT_DIPSETTING( 0x00, DEF_STR( Off ) ) + PORT_DIPNAME( 0x1c, 0x1c, DEF_STR( Coin_B ) ) PORT_DIPLOCATION("DSW2:6,5,4") + PORT_DIPSETTING( 0x1c, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x0c, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0x14, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x04, DEF_STR( 1C_4C ) ) + PORT_DIPSETTING( 0x18, DEF_STR( 1C_5C ) ) + PORT_DIPSETTING( 0x08, DEF_STR( 1C_6C ) ) + PORT_DIPSETTING( 0x10, DEF_STR( 1C_7C ) ) + PORT_DIPSETTING( 0x00, DEF_STR( 1C_8C ) ) + PORT_DIPNAME( 0xe0, 0xe0, DEF_STR( Coin_A ) ) PORT_DIPLOCATION("DSW2:3,2,1") + PORT_DIPSETTING( 0x00, DEF_STR( 5C_1C ) ) + PORT_DIPSETTING( 0x80, DEF_STR( 4C_1C ) ) + PORT_DIPSETTING( 0x40, DEF_STR( 3C_1C ) ) + PORT_DIPSETTING( 0xc0, DEF_STR( 2C_1C ) ) + PORT_DIPSETTING( 0xe0, DEF_STR( 1C_1C ) ) + PORT_DIPSETTING( 0x60, DEF_STR( 1C_2C ) ) + PORT_DIPSETTING( 0xa0, DEF_STR( 1C_3C ) ) + PORT_DIPSETTING( 0x20, DEF_STR( 1C_4C ) ) INPUT_PORTS_END @@ -273,7 +287,7 @@ TIMER_DEVICE_CALLBACK_MEMBER(acchi_state::scanline) static MACHINE_CONFIG_START( acchi, acchi_state ) - MCFG_CPU_ADD("maincpu", M68000, 16000000) // 16 Mhz XTAL, 16 Mhz CPU + MCFG_CPU_ADD("maincpu", M68000, XTAL_16MHz) // 16 MHz XTAL, 16 MHz CPU MCFG_CPU_PROGRAM_MAP(acchi_map) MCFG_CPU_VBLANK_INT_DRIVER("screen", acchi_state, irq4_line_hold) // 1 + 4 valid? (4 main VBL) MCFG_TIMER_DRIVER_ADD_SCANLINE("scantimer", acchi_state, scanline, "screen", 0, 1) @@ -293,10 +307,10 @@ static MACHINE_CONFIG_START( acchi, acchi_state ) MCFG_SPEAKER_STANDARD_MONO("mono") - MCFG_OKIM6295_ADD("oki1", 16000000/4, OKIM6295_PIN7_LOW) // not verified + MCFG_OKIM6295_ADD("oki1", XTAL_16MHz / 4, OKIM6295_PIN7_LOW) // not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) - MCFG_OKIM6295_ADD("oki2", 16000000/4, OKIM6295_PIN7_LOW) // not verified + MCFG_OKIM6295_ADD("oki2", XTAL_16MHz / 4, OKIM6295_PIN7_LOW) // not verified MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.40) MCFG_DEVICE_ADD("nmk112", NMK112, 0) // or 212? difficult to read (maybe 212 is 2* 112?) From fe01a1342c41b33601a8cd93904335b5039feda7 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 26 Apr 2017 09:02:36 +1000 Subject: [PATCH 5/5] version bump (nw) --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index bd7a505622d..4dff67c4bee 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index ec541167c0d..2d48ed5b92a 100644 --- a/makefile +++ b/makefile @@ -1546,14 +1546,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.184"' > $@ + @echo '#define BARE_BUILD_VERSION "0.185"' > $@ @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.184" > $@ + @echo #define BARE_BUILD_VERSION "0.185" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@