Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-23 08:49:55 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'mainline/release0200'

Browse Source
This commit is contained in:
Vas Crabb 2018-07-23 12:32:06 +10:00
commit 621106e577
3 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -55,12 +55,12 @@ Visual Studio builds are also possible, but you still need [build environment](h
In order to generate solution and project files just run:
```
make vs2015
make vs2017
```
or use this command to build it directly using msbuild
```
make vs2015 MSBUILD=1
make vs2017 MSBUILD=1
```

2
docs/source/initialsetup/compilingmame.rst
View File

@ -38,7 +38,7 @@ Here are specific notes about compiling MAME for Microsoft Windows.
* You will need to download the toolset from that link to begin. Periodically, these tools are updated and newer versions of MAME from that point on will **require** updated tools to compile.
* You can do compilation on Visual Studio 2015 (if installed on your PC) by using **make vs2015**. This will always regenerate the settings, so **REGENIE=1** is *not* needed.
* You can do compilation on Visual Studio 2017 (if installed on your PC) by using **make vs2017**. This will always regenerate the settings, so **REGENIE=1** is *not* needed.
* Make sure you get SDL 2 2.0.3 or 2.0.4 as earlier versions are buggy.

9
src/devices/cpu/mcs40/mcs40.h
View File

@ -269,10 +269,6 @@ protected:
virtual cycle do_cycle1(u8 opr, u8 opa, pmem &program_op) override;
virtual void do_cycle2(u8 opr, u8 opa, u8 arg) override;
virtual u8 do_io(u8 opr, u8 opa) override;
// configuration helpers
using mcs40_cpu_device_base::cm_rom_cb;
using mcs40_cpu_device_base::cm_ram_cb;
};
@ -297,11 +293,6 @@ protected:
// mcs40_cpu_device_base implementation
virtual cycle do_cycle1(u8 opr, u8 opa, pmem &program_op) override;
// configuration helpers
using mcs40_cpu_device_base::cm_rom_cb;
using mcs40_cpu_device_base::cm_ram_cb;
using mcs40_cpu_device_base::cy_cb;
};