From b281079d73b520e54a0e8f8c81dacc98314f2b08 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 25 Jun 2018 06:19:26 +1000 Subject: appease MSVC (nw) --- src/devices/bus/nes/mmc5.cpp | 3 --- src/devices/bus/nes/mmc5.h | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/devices/bus/nes/mmc5.cpp b/src/devices/bus/nes/mmc5.cpp index 3fb4a29e0a7..d5ca929c1eb 100644 --- a/src/devices/bus/nes/mmc5.cpp +++ b/src/devices/bus/nes/mmc5.cpp @@ -18,9 +18,6 @@ #include "emu.h" #include "mmc5.h" -#include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access ppu2c0x_device::BOTTOM_VISIBLE_SCANLINE -#include "sound/nes_apu.h" // temp hack to pass the additional sound regs to APU... - #ifdef NES_PCB_DEBUG #define VERBOSE 1 diff --git a/src/devices/bus/nes/mmc5.h b/src/devices/bus/nes/mmc5.h index e78bd36aa2f..c0c07cb07a9 100644 --- a/src/devices/bus/nes/mmc5.h +++ b/src/devices/bus/nes/mmc5.h @@ -7,9 +7,9 @@ #include "nxrom.h" +#include "sound/nes_apu.h" // temp hack to pass the additional sound regs to APU... +#include "video/ppu2c0x.h" // this has to be included so that IRQ functions can access ppu2c0x_device::BOTTOM_VISIBLE_SCANLINE -class ppu2c0x_device; -class nesapu_device; // ======================> nes_exrom_device -- cgit v1.2.3 From fdc9f38a8ee3e520339af0409bc7ced172a8acf9 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 25 Jun 2018 14:35:04 +1000 Subject: consider double epsilon when comapring crystal values --- src/emu/xtal.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/emu/xtal.cpp b/src/emu/xtal.cpp index b48ba2791c6..3c1f71d7cac 100644 --- a/src/emu/xtal.cpp +++ b/src/emu/xtal.cpp @@ -48,6 +48,9 @@ #include "emu.h" +#include +#include + // This array *must* stay in order, it's binary-searched const double XTAL::known_xtals[] = { @@ -380,8 +383,9 @@ bool XTAL::validate(double base_clock) if(slot > last_index) slot = slot ^ (step | (step >> 1)); else { - double sfreq = known_xtals[slot]; - if(base_clock == sfreq) { + const double sfreq = known_xtals[slot]; + const double diff = std::abs((base_clock - sfreq) / base_clock); + if(diff <= (2 * DBL_EPSILON)) { last_correct_value = base_clock; return true; } -- cgit v1.2.3 From 3a1182bdd478dac3c284549cb6152a5e96a6b34f Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 25 Jun 2018 14:36:10 +1000 Subject: damn PCH (nw) --- src/emu/romentry.cpp | 2 ++ src/emu/softlist.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/emu/romentry.cpp b/src/emu/romentry.cpp index 01df77c344a..4bd8cbd4e3c 100644 --- a/src/emu/romentry.cpp +++ b/src/emu/romentry.cpp @@ -8,7 +8,9 @@ *********************************************************************/ +#include "emu.h" #include "romentry.h" + #include "strformat.h" diff --git a/src/emu/softlist.cpp b/src/emu/softlist.cpp index 8854b8d5e39..40b0013490b 100644 --- a/src/emu/softlist.cpp +++ b/src/emu/softlist.cpp @@ -8,7 +8,9 @@ ***************************************************************************/ +#include "emu.h" #include "softlist.h" + #include "hash.h" #include "expat.h" -- cgit v1.2.3 From d3679a6ff400baed54ee6ae786132938c14f5b44 Mon Sep 17 00:00:00 2001 From: arbee Date: Sun, 24 Jun 2018 19:53:10 -0400 Subject: sonydriv: fixed long-standing disk-switch regression [R. Belmont] --- src/devices/machine/sonydriv.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/devices/machine/sonydriv.cpp b/src/devices/machine/sonydriv.cpp index b64743afb0d..c18b6429ae0 100644 --- a/src/devices/machine/sonydriv.cpp +++ b/src/devices/machine/sonydriv.cpp @@ -430,6 +430,12 @@ static void sony_doaction(device_t *device) break; case 0x03: /* Reset diskswitched */ f->disk_switched = 0; + // flopdrv.cpp won't reset its disk switch flag without + // doing a seek. So we do a seek of 0 tracks, which works. + if (cur_image) + { + cur_image->floppy_drive_seek(0); + } break; case 0x04: /* Step disk */ if (cur_image) -- cgit v1.2.3 From dcae68a2f634f50dadb6de907d17bf8d5521f731 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 25 Jun 2018 18:59:20 +1000 Subject: logerror is cool with std::string - don't use .c_str, some ostream flags stick, also const (nw) --- src/devices/machine/upd765.cpp | 72 +++++++++++++++++++++--------------------- src/devices/machine/upd765.h | 4 +-- 2 files changed, 38 insertions(+), 38 deletions(-) diff --git a/src/devices/machine/upd765.cpp b/src/devices/machine/upd765.cpp index 9b9f8e32de1..cd4793244f3 100644 --- a/src/devices/machine/upd765.cpp +++ b/src/devices/machine/upd765.cpp @@ -21,7 +21,9 @@ #define VERBOSE (LOG_GENERAL | LOG_WARN ) #include "logmacro.h" -#include // std::setw + +#include +#include #define LOGWARN(...) LOGMASKED(LOG_WARN, __VA_ARGS__) #define LOGSHIFT(...) LOGMASKED(LOG_SHIFT, __VA_ARGS__) @@ -759,7 +761,7 @@ void upd765_family_device::live_run(attotime limit) if(read_one_bit(limit)) return; - LOGSHIFT("%s: shift = %04x data=%02x c=%d\n", tts(cur_live.tm).c_str(), cur_live.shift_reg, + LOGSHIFT("%s: shift = %04x data=%02x c=%d\n", tts(cur_live.tm), cur_live.shift_reg, (cur_live.shift_reg & 0x4000 ? 0x80 : 0x00) | (cur_live.shift_reg & 0x1000 ? 0x40 : 0x00) | (cur_live.shift_reg & 0x0400 ? 0x20 : 0x00) | @@ -775,7 +777,7 @@ void upd765_family_device::live_run(attotime limit) cur_live.data_separator_phase = false; cur_live.bit_counter = 0; cur_live.state = READ_HEADER_BLOCK_HEADER; - LOGLIVE("%s: Found A1\n", tts(cur_live.tm).c_str()); + LOGLIVE("%s: Found A1\n", tts(cur_live.tm)); } if(!mfm && cur_live.shift_reg == 0xf57e) { @@ -783,7 +785,7 @@ void upd765_family_device::live_run(attotime limit) cur_live.data_separator_phase = false; cur_live.bit_counter = 0; cur_live.state = READ_ID_BLOCK; - LOGLIVE("%s: Found IDAM\n", tts(cur_live.tm).c_str()); + LOGLIVE("%s: Found IDAM\n", tts(cur_live.tm)); } break; @@ -791,7 +793,7 @@ void upd765_family_device::live_run(attotime limit) if(read_one_bit(limit)) return; - LOGSHIFT("%s: shift = %04x data=%02x counter=%d\n", tts(cur_live.tm).c_str(), cur_live.shift_reg, + LOGSHIFT("%s: shift = %04x data=%02x counter=%d\n", tts(cur_live.tm), cur_live.shift_reg, (cur_live.shift_reg & 0x4000 ? 0x80 : 0x00) | (cur_live.shift_reg & 0x1000 ? 0x40 : 0x00) | (cur_live.shift_reg & 0x0400 ? 0x20 : 0x00) | @@ -811,11 +813,11 @@ void upd765_family_device::live_run(attotime limit) if(cur_live.shift_reg != 0x4489) cur_live.state = SEARCH_ADDRESS_MARK_HEADER; else - LOGLIVE("%s: Found A1\n", tts(cur_live.tm).c_str()); + LOGLIVE("%s: Found A1\n", tts(cur_live.tm)); break; } if(cur_live.data_reg != 0xfe) { - LOGLIVE("%s: No ident byte found after triple-A1, continue search\n", tts(cur_live.tm).c_str()); + LOGLIVE("%s: No ident byte found after triple-A1, continue search\n", tts(cur_live.tm)); cur_live.state = SEARCH_ADDRESS_MARK_HEADER; break; } @@ -833,7 +835,7 @@ void upd765_family_device::live_run(attotime limit) break; int slot = (cur_live.bit_counter >> 4)-1; - LOGLIVE("%s: slot=%d data=%02x crc=%04x\n", tts(cur_live.tm).c_str(), slot, cur_live.data_reg, cur_live.crc); + LOGLIVE("%s: slot=%d data=%02x crc=%04x\n", tts(cur_live.tm), slot, cur_live.data_reg, cur_live.crc); cur_live.idbuf[slot] = cur_live.data_reg; if(slot == 5) { live_delay(IDLE); @@ -846,7 +848,7 @@ void upd765_family_device::live_run(attotime limit) if(read_one_bit(limit)) return; - LOGSHIFT("%s: shift = %04x data=%02x c=%d.%x\n", tts(cur_live.tm).c_str(), cur_live.shift_reg, + LOGSHIFT("%s: shift = %04x data=%02x c=%d.%x\n", tts(cur_live.tm), cur_live.shift_reg, (cur_live.shift_reg & 0x4000 ? 0x80 : 0x00) | (cur_live.shift_reg & 0x1000 ? 0x40 : 0x00) | (cur_live.shift_reg & 0x0400 ? 0x20 : 0x00) | @@ -891,7 +893,7 @@ void upd765_family_device::live_run(attotime limit) if(read_one_bit(limit)) return; - LOGSHIFT("%s: shift = %04x data=%02x counter=%d\n", tts(cur_live.tm).c_str(), cur_live.shift_reg, + LOGSHIFT("%s: shift = %04x data=%02x counter=%d\n", tts(cur_live.tm), cur_live.shift_reg, (cur_live.shift_reg & 0x4000 ? 0x80 : 0x00) | (cur_live.shift_reg & 0x1000 ? 0x40 : 0x00) | (cur_live.shift_reg & 0x0400 ? 0x20 : 0x00) | @@ -1202,7 +1204,7 @@ void upd765_family_device::live_run(attotime limit) break; default: - LOGWARN("%s: Unknown live state %d\n", tts(cur_live.tm).c_str(), cur_live.state); + LOGWARN("%s: Unknown live state %d\n", tts(cur_live.tm), cur_live.state); return; } } @@ -1832,7 +1834,7 @@ void upd765_family_device::read_data_continue(floppy_info &fi) return; default: - LOGWARN("%s: read sector unknown sub-state %d\n", ttsn().c_str(), fi.sub_state); + LOGWARN("%s: read sector unknown sub-state %d\n", ttsn(), fi.sub_state); return; } } @@ -1970,7 +1972,7 @@ void upd765_family_device::write_data_continue(floppy_info &fi) return; default: - LOGWARN("%s: write sector unknown sub-state %d\n", ttsn().c_str(), fi.sub_state); + LOGWARN("%s: write sector unknown sub-state %d\n", ttsn(), fi.sub_state); return; } } @@ -2156,7 +2158,7 @@ void upd765_family_device::read_track_continue(floppy_info &fi) return; default: - LOGWARN("%s: read track unknown sub-state %d\n", ttsn().c_str(), fi.sub_state); + LOGWARN("%s: read track unknown sub-state %d\n", ttsn(), fi.sub_state); return; } } @@ -2237,7 +2239,7 @@ void upd765_family_device::format_track_continue(floppy_info &fi) return; default: - LOGWARN("%s: format track unknown sub-state %d\n", ttsn().c_str(), fi.sub_state); + LOGWARN("%s: format track unknown sub-state %d\n", ttsn(), fi.sub_state); return; } } @@ -2327,7 +2329,7 @@ void upd765_family_device::read_id_continue(floppy_info &fi) return; default: - LOGWARN("%s: read id unknown sub-state %d\n", ttsn().c_str(), fi.sub_state); + LOGWARN("%s: read id unknown sub-state %d\n", ttsn(), fi.sub_state); return; } } @@ -2351,33 +2353,31 @@ bool upd765_family_device::get_irq() const std::string upd765_family_device::tts(attotime t) { - char buf[256]; const char *sign = ""; if(t.seconds() < 0) { - t = attotime::zero-t; + t = attotime::zero - t; sign = "-"; } - int nsec = t.attoseconds() / ATTOSECONDS_PER_NANOSECOND; - sprintf(buf, "%s%04d.%03d,%03d,%03d", sign, int(t.seconds()), nsec/1000000, (nsec/1000)%1000, nsec % 1000); - return buf; + int const nsec = t.attoseconds() / ATTOSECONDS_PER_NANOSECOND; + return util::string_format("%s%04d.%03d,%03d,%03d", sign, int(t.seconds()), nsec/1000000, (nsec/1000)%1000, nsec % 1000); } -std::string upd765_family_device::results() +std::string upd765_family_device::results() const { - std::stringstream stream; + std::ostringstream stream; stream << "results=("; - if (result_pos==0) stream << "none"; + if (!result_pos) stream << "none"; else - for (int i=0; i < result_pos; i++) - { - stream << std::hex << std::setw(2) << std::setfill('0') << (int)result[i]; - if (i < result_pos-1) stream << ','; - } + { + stream << std::hex << std::setfill('0') << std::setw(2) << unsigned(result[0]); + for (int i=1; i < result_pos; i++) + stream << ',' << std::setw(2) << unsigned(result[i]); + } stream << ')'; return stream.str(); } -std::string upd765_family_device::ttsn() +std::string upd765_family_device::ttsn() const { return tts(machine().time()); } @@ -2428,7 +2428,7 @@ void upd765_family_device::run_drive_ready_polling() void upd765_family_device::index_callback(floppy_image_device *floppy, int state) { LOGSTATE("Index pulse %d\n", state); - LOGLIVE("%s: Pulse %d\n", ttsn().c_str(), state); + LOGLIVE("%s: Pulse %d\n", ttsn(), state); for(floppy_info & fi : flopi) { if(fi.dev != floppy) continue; @@ -2472,7 +2472,7 @@ void upd765_family_device::index_callback(floppy_image_device *floppy, int state break; default: - LOGWARN("%s: Index pulse on unknown sub-state %d\n", ttsn().c_str(), fi.sub_state); + LOGWARN("%s: Index pulse on unknown sub-state %d\n", ttsn(), fi.sub_state); break; } @@ -2520,7 +2520,7 @@ void upd765_family_device::general_continue(floppy_info &fi) break; default: - LOGWARN("%s: general_continue on unknown main-state %d\n", ttsn().c_str(), fi.main_state); + LOGWARN("%s: general_continue on unknown main-state %d\n", ttsn(), fi.main_state); break; } } @@ -2561,7 +2561,7 @@ bool upd765_family_device::write_one_bit(const attotime &limit) void upd765_family_device::live_write_raw(uint16_t raw) { - LOGLIVE("%s: write %04x %04x\n", tts(cur_live.tm).c_str(), raw, cur_live.crc); + LOGLIVE("%s: write %04x %04x\n", tts(cur_live.tm), raw, cur_live.crc); cur_live.shift_reg = raw; cur_live.data_bit_context = raw & 1; } @@ -2581,7 +2581,7 @@ void upd765_family_device::live_write_mfm(uint8_t mfm) cur_live.data_reg = mfm; cur_live.shift_reg = raw; cur_live.data_bit_context = context; - LOGLIVE("%s: write %02x %04x %04x\n", tts(cur_live.tm).c_str(), mfm, cur_live.crc, raw); + LOGLIVE("%s: write %02x %04x %04x\n", tts(cur_live.tm), mfm, cur_live.crc, raw); } void upd765_family_device::live_write_fm(uint8_t fm) @@ -2593,7 +2593,7 @@ void upd765_family_device::live_write_fm(uint8_t fm) cur_live.data_reg = fm; cur_live.shift_reg = raw; cur_live.data_bit_context = fm & 1; - LOGLIVE("%s: write %02x %04x %04x\n", tts(cur_live.tm).c_str(), fm, cur_live.crc, raw); + LOGLIVE("%s: write %02x %04x %04x\n", tts(cur_live.tm), fm, cur_live.crc, raw); } bool upd765_family_device::sector_matches() const diff --git a/src/devices/machine/upd765.h b/src/devices/machine/upd765.h index f893f5fbf32..2eefbc9ae55 100644 --- a/src/devices/machine/upd765.h +++ b/src/devices/machine/upd765.h @@ -346,8 +346,8 @@ protected: emu_timer *poll_timer; static std::string tts(attotime t); - std::string results(); - std::string ttsn(); + std::string results() const; + std::string ttsn() const; enum { C_CONFIGURE, -- cgit v1.2.3 From 723d46727fa30ef8d641ae2cfc361b3b8177252a Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 25 Jun 2018 21:19:12 +1000 Subject: left-associativity, yo (nw) --- src/mame/drivers/buggychl.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/mame/drivers/buggychl.cpp b/src/mame/drivers/buggychl.cpp index 86b5ebb9d16..ab4809c8a88 100644 --- a/src/mame/drivers/buggychl.cpp +++ b/src/mame/drivers/buggychl.cpp @@ -513,24 +513,24 @@ void buggychl_state::machine_reset() MACHINE_CONFIG_START(buggychl_state::buggychl) /* basic machine hardware */ - MCFG_DEVICE_ADD("maincpu", Z80, XTAL(48'000'000)/8) /* 6 MHz according to schematics, though it can be jumpered for 4MHz as well */ + MCFG_DEVICE_ADD("maincpu", Z80, 48_MHz_XTAL/8) /* 6 MHz according to schematics, though it can be jumpered for 4MHz as well */ MCFG_DEVICE_PROGRAM_MAP(buggychl_map) MCFG_DEVICE_VBLANK_INT_DRIVER("screen", buggychl_state, irq0_line_hold) - MCFG_DEVICE_ADD("audiocpu", Z80, XTAL(8'000'000)/2) /* 4 MHz according to schematics */ + MCFG_DEVICE_ADD("audiocpu", Z80, 8_MHz_XTAL/2) /* 4 MHz according to schematics */ MCFG_DEVICE_PROGRAM_MAP(sound_map) - MCFG_DEVICE_PERIODIC_INT_DRIVER(buggychl_state, irq0_line_hold, ((((XTAL(8'000'000)/2)/2)/256)/64)) // timer irq - //MCFG_TIMER_DEVICE_ADD_PERIODIC("soundirq", "audiocpu", irq0_line_hold, ((((XTAL_8MHz/2)/2)/256)/64)) + MCFG_DEVICE_PERIODIC_INT_DRIVER(buggychl_state, irq0_line_hold, 8_MHz_XTAL/2/2/256/64) // timer irq + //MCFG_TIMER_DEVICE_ADD_PERIODIC("soundirq", "audiocpu", irq0_line_hold, 8_MHz_XTAL/2/2/256/64) // The schematics (which are at least partly for the wrong sound board) show a configurable timer with rates of - // 61.035Hz ((((XTAL_8MHz/2)/2)/256)/128) - // or 122.0Hz ((((XTAL_8MHz/2)/2)/256)/64) + // 61.035Hz (8_MHz_XTAL/2/2/256/128) + // or 122.0Hz (8_MHz_XTAL/2/2/256/64) // similar to flstory.cpp and other Taito MSM5232 based games. // The real sound pcb probably lacks the latch for this configurable timer, but does have a jumper which likely has a similar function. // The game code implies the timer int is enable/disabled by one of the "sound_enable_w" bits? // TODO: actually hook this up? /* audiocpu nmi is caused by (main->sound semaphore)&&(sound_nmi_enabled), identical to bubble bobble. */ - MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, (XTAL(48'000'000)/8)/2) /* CPUspeed/2 MHz according to schematics, so 3MHz if cpu is jumpered for 6MHz */ + MCFG_DEVICE_ADD("bmcu", TAITO68705_MCU, 48_MHz_XTAL/8/2) /* CPUspeed/2 MHz according to schematics, so 3MHz if cpu is jumpered for 6MHz */ MCFG_WATCHDOG_ADD("watchdog") @@ -543,7 +543,7 @@ MACHINE_CONFIG_START(buggychl_state::buggychl) MCFG_SCREEN_SIZE(32*8, 32*8) MCFG_SCREEN_VISIBLE_AREA(0*8, 32*8-1, 2*8, 30*8-1) // derived from ladyfrog.cpp, causes glitches? -// MCFG_SCREEN_RAW_PARAMS( XTAL(8'000'000), 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz +// MCFG_SCREEN_RAW_PARAMS( 8_MHz_XTAL, 510, 0, 256, 262, 2*8, 30*8 ) // pixel clock appears to run at 8 MHz MCFG_SCREEN_UPDATE_DRIVER(buggychl_state, screen_update_buggychl) MCFG_SCREEN_PALETTE("palette") @@ -566,17 +566,17 @@ MACHINE_CONFIG_START(buggychl_state::buggychl) MCFG_TA7630_ADD("ta7630") - MCFG_DEVICE_ADD("ay1", YM2149, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD("ay1", YM2149, 8_MHz_XTAL/4) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, buggychl_state, ta7630_volbal_ay1_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, buggychl_state, port_b_0_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MCFG_DEVICE_ADD("ay2", YM2149, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD("ay2", YM2149, 8_MHz_XTAL/4) MCFG_AY8910_PORT_A_WRITE_CB(WRITE8(*this, buggychl_state, ta7630_volbal_ay2_w)) MCFG_AY8910_PORT_B_WRITE_CB(WRITE8(*this, buggychl_state, port_b_1_w)) MCFG_SOUND_ROUTE(ALL_OUTPUTS, "mono", 0.50) - MCFG_DEVICE_ADD("msm", MSM5232, XTAL(8'000'000)/4) + MCFG_DEVICE_ADD("msm", MSM5232, 8_MHz_XTAL/4) MCFG_MSM5232_SET_CAPACITORS(0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6, 0.39e-6) /* default 0.39 uF capacitors (not verified) */ MCFG_SOUND_ROUTE(0, "mono", 1.0) // pin 28 2'-1 MCFG_SOUND_ROUTE(1, "mono", 1.0) // pin 29 4'-1 -- cgit v1.2.3 From dfc00d6704cf2215d90f92106e0c393fdbfd235c Mon Sep 17 00:00:00 2001 From: hap Date: Wed, 27 Jun 2018 00:07:00 +0200 Subject: ddragon: revert sprite position regression (nw) --- src/mame/video/ddragon.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mame/video/ddragon.cpp b/src/mame/video/ddragon.cpp index b79ab7f911b..05b8d36125a 100644 --- a/src/mame/video/ddragon.cpp +++ b/src/mame/video/ddragon.cpp @@ -148,8 +148,8 @@ void ddragon_state::draw_sprites(bitmap_ind16 &bitmap,const rectangle &cliprect) int attr = src[i + 1]; if (attr & 0x80) /* visible */ { - int sx = 240 - (src[i + 4] | ((attr & 2) << 7)); - int sy = 232 - (src[i + 0] | ((attr & 1) << 8)); + int sx = 240 - src[i + 4] + ((attr & 2) << 7); + int sy = 232 - src[i + 0] + ((attr & 1) << 8); int size = (attr & 0x30) >> 4; int flipx = attr & 8; int flipy = attr & 4; -- cgit v1.2.3 From f2e805a1538ebe4c9e4e321efe731fe973fb6746 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 26 Jun 2018 23:43:27 +1000 Subject: 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 41aa836fb40..5cb4bcddd28 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 5fb09182e9f..f0d4a5963e9 100644 --- a/makefile +++ b/makefile @@ -1584,14 +1584,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.198"' > $@ + @echo '#define BARE_BUILD_VERSION "0.199"' > $@ @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.198" > $@ + @echo #define BARE_BUILD_VERSION "0.199" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ -- cgit v1.2.3