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

13
src/win/Makefile.mingw
View File

@@ -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
@@ -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_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 \
keyboard.o \
keyboard_xt.o keyboard_at.o \