[VM] Fix FTBFSs.

diff --git a/source/src/vm/fm16beta/fm16beta.h b/source/src/vm/fm16beta/fm16beta.h
index a32cd05..1c35118 100644 (file)
--- a/source/src/vm/fm16beta/fm16beta.h
+++ b/source/src/vm/fm16beta/fm16beta.h
@@ -132,7 +132,7 @@ public:
        
        // drive virtual machine
        void reset();
-       //void notify_power_off();
+       void notify_power_off() { }
        void run();
        
 #ifdef USE_DEBUGGER

diff --git a/source/src/vm/j3100/j3100.h b/source/src/vm/j3100/j3100.h
index 339773a..525b072 100644 (file)
--- a/source/src/vm/j3100/j3100.h
+++ b/source/src/vm/j3100/j3100.h
@@ -150,7 +150,7 @@ public:
        
        // drive virtual machine
        void reset();
-       void notify_power_off();
+       void notify_power_off() { }
        void run();
        
 #ifdef USE_DEBUGGER

diff --git a/source/src/vm/jr100/jr100.h b/source/src/vm/jr100/jr100.h
index 3d880ff..7dbe5d8 100644 (file)
--- a/source/src/vm/jr100/jr100.h
+++ b/source/src/vm/jr100/jr100.h
@@ -179,8 +179,8 @@ public:
 #endif
        
        // notify key
-       void key_down(int code, bool repeat);
-       void key_up(int code);
+       void key_down(int code, bool repeat) { }
+       void key_up(int code) { }
        
        // user interface
        void play_tape(int drv, const _TCHAR* file_path);

diff --git a/source/src/vm/jx/jx.h b/source/src/vm/jx/jx.h
index ebf76c5..961f3d7 100644 (file)
--- a/source/src/vm/jx/jx.h
+++ b/source/src/vm/jx/jx.h
@@ -124,7 +124,7 @@ public:
        
        // drive virtual machine
        void reset();
-       void notify_power_off();
+       void notify_power_off() { }
        void run();
        
 #ifdef USE_DEBUGGER

diff --git a/source/src/vm/mz2800/reset.cpp b/source/src/vm/mz2800/reset.cpp
index 28efe96..36ca2ec 100644 (file)
--- a/source/src/vm/mz2800/reset.cpp
+++ b/source/src/vm/mz2800/reset.cpp
@@ -18,7 +18,7 @@ void RESET::write_signal(int id, uint32_t data, uint32_t mask)
 {
        // from i8255 port c
        if(!(prev & 2) && (data & 2)) {
-               vm->cpu_reset();
+               static_cast<VM *>(vm)->cpu_reset();
        }
        if(!(prev & 8) && (data & 8)) {
                vm->reset();

diff --git a/source/src/vm/mz3500/mz3500.h b/source/src/vm/mz3500/mz3500.h
index fb990b8..f898b6d 100644 (file)
--- a/source/src/vm/mz3500/mz3500.h
+++ b/source/src/vm/mz3500/mz3500.h
@@ -81,7 +81,7 @@ class MAIN;
 class SUB;
 class KEYBOARD;
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
        //EMU* emu;

diff --git a/source/src/vm/mz5500/mz5500.h b/source/src/vm/mz5500/mz5500.h
index 6a764a2..9759207 100644 (file)
--- a/source/src/vm/mz5500/mz5500.h
+++ b/source/src/vm/mz5500/mz5500.h
@@ -106,7 +106,7 @@ class KEYBOARD;
 class MEMORY;
 class SYSPORT;
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
        //EMU* emu;

diff --git a/source/src/vm/mz700/mz700.h b/source/src/vm/mz700/mz700.h
index 74501e3..a3b2916 100644 (file)
--- a/source/src/vm/mz700/mz700.h
+++ b/source/src/vm/mz700/mz700.h
@@ -212,7 +212,7 @@ class PSG;
 class QUICKDISK;
 #endif
 
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
        //EMU* emu;

diff --git a/source/src/vm/pc2001/pc2001.h b/source/src/vm/pc2001/pc2001.h
index 6bacb67..2b93621 100644 (file)
--- a/source/src/vm/pc2001/pc2001.h
+++ b/source/src/vm/pc2001/pc2001.h
@@ -40,6 +40,7 @@
 #define USE_CPU_UPD7810
 
 #include "../../common.h"
+#include "../../fileio.h"
 #include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
@@ -61,10 +62,7 @@ class UPD1990A;
 class UPD7810;
 
 class IO;
-
-#include "../../fileio.h"
-
-class VM
+class VM : public VM_TEMPLATE
 {
 protected:
        //EMU* emu;

diff --git a/source/src/vm/x07/x07.h b/source/src/vm/x07/x07.h
index 69fe55e..6f87b7a 100644 (file)
--- a/source/src/vm/x07/x07.h
+++ b/source/src/vm/x07/x07.h
@@ -45,6 +45,7 @@
 #define USE_CPU_Z80
 
 #include "../../common.h"
+#include "../../fileio.h"
 #include "../vm_template.h"
 
 #ifdef USE_SOUND_VOLUME
@@ -64,9 +65,6 @@ class MEMORY;
 class Z80;
 
 class IO;
-
-#include "../../fileio.h"
-
 class VM : public VM_TEMPLATE
 {
 protected: