Revert "Revert "Merge branch 'feature/machine_and_kb' into master""

This reverts commit f2cd3756dd.
This commit is contained in:
OBattler
2021-07-04 17:40:39 +02:00
parent 3b61d8a4d1
commit 4f6df76f10
77 changed files with 11883 additions and 3484 deletions

View File

@@ -14,8 +14,8 @@
#
# WIN32 marks us as a GUI app on Windows
add_executable(86Box WIN32 86box.c config.c random.c timer.c io.c acpi.c apm.c
dma.c ddma.c nmi.c pic.c pit.c port_92.c ppi.c pci.c mca.c usb.c
add_executable(86Box WIN32 86box.c config.c log.c random.c timer.c io.c acpi.c apm.c
dma.c ddma.c nmi.c pic.c pit.c port_6x.c port_92.c ppi.c pci.c mca.c usb.c
device.c nvr.c nvr_at.c nvr_ps2.c)
if(NEW_DYNAREC)