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

Merge branch 'master' of https://github.com/86Box/86Box

Browse Source
This commit is contained in:
OBattler
2021-12-18 17:49:27 +01:00
parent fe4ae456f8 e99eb8f64d
commit bdc8c711bf
7 changed files with 1035 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/win/Makefile.mingw
View File

@@ -474,7 +474,7 @@ CXXFLAGS := $(CFLAGS)
# Create the (final) list of objects to build. #
#########################################################################
MAINOBJ := 86box.o config.o log.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \
nmi.o pic.o pit.o port_6x.o port_92.o ppi.o pci.o mca.o \
nmi.o pic.o pit.o port_6x.o port_92.o ppi.o pci.o mca.o fifo8.o \
usb.o device.o nvr.o nvr_at.o nvr_ps2.o \
$(VNCOBJ)