claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Miran Grča
2020-08-27 19:39:09 +02:00
committed by GitHub
parent 0950814d40 93cafb06bf
commit 06a00bbee6
4 changed files with 530 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/machine.h
View File

@@ -446,9 +446,7 @@ extern int machine_at_s370sba_init(const machine_t *);
extern int machine_at_apas3_init(const machine_t *); extern int machine_at_apas3_init(const machine_t *);
/* m_at_misc.c */ /* m_at_misc.c */
#if defined(DEV_BRANCH) && defined(USE_VIRTUALPC)
extern int machine_at_vpc2007_init(const machine_t *); extern int machine_at_vpc2007_init(const machine_t *);
#endif
/* m_at_t3100e.c */ /* m_at_t3100e.c */
extern int machine_at_t3100e_init(const machine_t *); extern int machine_at_t3100e_init(const machine_t *);

1058
src/machine/m_at_slot1.c
View File

File diff suppressed because it is too large Load Diff

2
src/machine/machine_table.c
View File

@@ -384,9 +384,7 @@ const machine_t machines[] = {
/* VIA Apollo Pro */ /* VIA Apollo Pro */
{ "[VIA Apollo Pro] PC Partner APAS3", "apas3", MACHINE_TYPE_SOCKET370, {{"Intel", cpus_Celeron}, {"VIA", cpus_Cyrix3}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 768, 8, 255, machine_at_apas3_init, NULL }, { "[VIA Apollo Pro] PC Partner APAS3", "apas3", MACHINE_TYPE_SOCKET370, {{"Intel", cpus_Celeron}, {"VIA", cpus_Cyrix3}, {"", NULL}, {"", NULL}, {"", NULL}}, MACHINE_PCI | MACHINE_ISA | MACHINE_AT | MACHINE_PS2 | MACHINE_HDC, 8, 768, 8, 255, machine_at_apas3_init, NULL },
#if defined(DEV_BRANCH) && defined(USE_VIRTUALPC)
{ "[i440BX] Microsoft Virtual PC 2007", "vpc2007", MACHINE_TYPE_MISC, {{"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 }, { "[i440BX] Microsoft Virtual PC 2007", "vpc2007", MACHINE_TYPE_MISC, {{"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
{ NULL, NULL, MACHINE_TYPE_NONE, {{"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}}, 0, 0, 0, 0, 0, NULL, NULL } { NULL, NULL, MACHINE_TYPE_NONE, {{"", 0}, {"", 0}, {"", 0}, {"", 0}, {"", 0}}, 0, 0, 0, 0, 0, NULL, NULL }
}; };

13
src/win/Makefile.mingw
View File

@@ -87,9 +87,6 @@ ifeq ($(DEV_BUILD), y)
ifndef VGAWONDER ifndef VGAWONDER
VGAWONDER := y VGAWONDER := y
endif endif
ifndef VIRTUALPC
VIRTUALPC := y
endif
ifndef VNC ifndef VNC
VNC := y VNC := y
endif endif
@@ -169,9 +166,6 @@ else
ifndef VGAWONDER ifndef VGAWONDER
VGAWONDER := n VGAWONDER := n
endif endif
ifndef VIRTUALPC
VIRTUALPC := y
endif
ifndef VNC ifndef VNC
VNC := n VNC := n
endif endif
@@ -582,11 +576,6 @@ ifeq ($(VGAWONDER), y)
OPTS += -DUSE_VGAWONDER OPTS += -DUSE_VGAWONDER
endif endif
ifeq ($(VIRTUALPC), y)
OPTS += -DUSE_VIRTUALPC
DEVBROBJ += vpc2007.o
endif
ifeq ($(WIN471), y) ifeq ($(WIN471), y)
OPTS += -DUSE_WIN471 OPTS += -DUSE_WIN471
endif endif
@@ -660,7 +649,7 @@ MCHOBJ := machine.o machine_table.o \
m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o \ m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o \
m_at_misc.o m_at_misc.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 \ smbus.o smbus_piix4.o \
keyboard.o \ keyboard.o \
keyboard_xt.o keyboard_at.o \ keyboard_xt.o keyboard_at.o \