From 37ce51ffb741a8a418e29a85422b6fd3eceda01c Mon Sep 17 00:00:00 2001
From: RichardG867 <richardg867@gmail.com>
Date: Thu, 27 Aug 2020 13:50:01 -0300
Subject: [PATCH] Remove vpc2007 from devbranch, part 2

---
 src/include/86box/machine.h |  2 --
 src/machine/machine_table.c |  2 --
 src/win/Makefile.mingw      | 13 +------------
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/include/86box/machine.h b/src/include/86box/machine.h
index bae2e0965..f8929ed9f 100644
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -424,9 +424,7 @@ extern int	machine_at_ax6bc_init(const machine_t *);
 extern int	machine_at_atc6310bxii_init(const machine_t *);
 extern int	machine_at_tsunamiatx_init(const machine_t *);
 extern int	machine_at_p6sba_init(const machine_t *);
-#if defined(DEV_BRANCH) && defined(USE_VIRTUALPC)
 extern int	machine_at_vpc2007_init(const machine_t *);
-#endif
 
 #ifdef EMU_DEVICE_H
 extern const device_t 	*at_tsunamiatx_get_device(void);
diff --git a/src/machine/machine_table.c b/src/machine/machine_table.c
index 6c3d5dfc0..12826d6e2 100644
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -361,9 +361,7 @@ const machine_t machines[] = {
     { "[i440BX] A-Trend ATC6310BXII",		"atc6310bxii",		MACHINE_TYPE_SLOT1,		{{"Intel", cpus_PentiumII},   {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			 		  8,  768,   8, 255,	  machine_at_atc6310bxii_init, NULL			},
     { "[i440BX] Tyan Tsunami ATX",		"tsunamiatx",		MACHINE_TYPE_SLOT1,		{{"Intel", cpus_PentiumII},   {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC | MACHINE_SOUND,	 		  8, 1024,   8, 255,	   machine_at_tsunamiatx_init, at_tsunamiatx_get_device	},
     { "[i440BX] SuperMicro Super P6SBA",	"p6sba",		MACHINE_TYPE_SLOT1,		{{"Intel", cpus_PentiumII},   {"Intel/PGA370", cpus_Celeron},{"VIA", cpus_Cyrix3},{"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			  		  8,  768,   8, 255,	        machine_at_p6sba_init, NULL			},
-#if defined(DEV_BRANCH) && defined(USE_VIRTUALPC)
     { "[i440BX] Microsoft Virtual PC 2007",	"vpc2007",		MACHINE_TYPE_SLOT1,		{{"Intel", cpus_PentiumIID},  {"Intel/PGA370", cpus_Celeron},{"",      NULL},     {"",      NULL},{"",      NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC,			  		  8, 1024,   8, 255,	      machine_at_vpc2007_init, NULL			},
-#endif
 
     /* Slot 2 machines(Including Slot 1/2 Hybrids) */
     /* 440GX */
diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw
index 84cd3750e..74b1e8f01 100644
--- a/src/win/Makefile.mingw
+++ b/src/win/Makefile.mingw
@@ -87,9 +87,6 @@ ifeq ($(DEV_BUILD), y)
  ifndef VGAWONDER
   VGAWONDER	:= y
  endif
- ifndef VIRTUALPC
-  VIRTUALPC := y
- endif
  ifndef VNC
   VNC		:= y
  endif
@@ -169,9 +166,6 @@ else
  ifndef VGAWONDER
   VGAWONDER	:= n
  endif
- ifndef VIRTUALPC
-  VIRTUALPC	:= y
- endif
  ifndef VNC
   VNC		:= n
  endif
@@ -582,11 +576,6 @@ ifeq ($(VGAWONDER), y)
 OPTS		+= -DUSE_VGAWONDER
 endif
 
-ifeq ($(VIRTUALPC), y)
-OPTS		+= -DUSE_VIRTUALPC
-DEVBROBJ	+= vpc2007.o
-endif
-
 ifeq ($(WIN471), y)
 OPTS		+= -DUSE_WIN471
 endif
@@ -659,7 +648,7 @@ MCHOBJ		:= machine.o machine_table.o \
 		    m_at_socket4_5.o m_at_socket7_s7.o m_at_sockets7.o \
 		    m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o
 
-DEVOBJ		:= bugger.o hwm.o hwm_lm75.o hwm_lm78.o hwm_gl518sm.o ibm_5161.o isamem.o isartc.o lpt.o postcard.o serial.o \
+DEVOBJ		:= bugger.o hwm.o hwm_lm75.o hwm_lm78.o hwm_gl518sm.o ibm_5161.o isamem.o isartc.o lpt.o postcard.o serial.o vpc2007.o \
 		    smbus.o smbus_piix4.o \
 		   keyboard.o \
 		    keyboard_xt.o keyboard_at.o \