summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2018-07-23 12:32:06 +1000
committer Vas Crabb <vas@vastheman.com>2018-07-23 12:32:06 +1000
commit621106e57750259a843120089c10b1260f35e247 (patch)
tree20006495591cf49d26a33192c8b426b6d83bb8ea
parentad21d054bf72f1ca33ba237b6de0d1fd6381f9a1 (diff)
parentccfcb431d0089f84ef37603c0bd76f78be69c9dd (diff)
Merge remote-tracking branch 'mainline/release0200'
-rw-r--r--README.md4
-rw-r--r--docs/source/initialsetup/compilingmame.rst2
-rw-r--r--src/devices/cpu/mcs40/mcs40.h9
3 files changed, 3 insertions, 12 deletions
diff --git a/README.md b/README.md
index f6c28090a62..22d62f68ace 100644
--- a/README.md
+++ b/README.md
@@ -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
```
diff --git a/docs/source/initialsetup/compilingmame.rst b/docs/source/initialsetup/compilingmame.rst
index f306e58eb2f..262d423da80 100644
--- a/docs/source/initialsetup/compilingmame.rst
+++ b/docs/source/initialsetup/compilingmame.rst
@@ -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.
diff --git a/src/devices/cpu/mcs40/mcs40.h b/src/devices/cpu/mcs40/mcs40.h
index d4778cd13c3..d8ca4059631 100644
--- a/src/devices/cpu/mcs40/mcs40.h
+++ b/src/devices/cpu/mcs40/mcs40.h
@@ -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;
};