From b0367133d6c987286c2fcf4b50fa24d7f91389ca Mon Sep 17 00:00:00 2001 From: OBattler Date: Tue, 14 Sep 2021 22:36:21 +0200 Subject: [PATCH] And back. --- src/CMakeLists.txt | 4 ++-- src/win/Makefile.mingw | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a3cbc2e76..2bfca1c94 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 thread.c) if(NEW_DYNAREC) diff --git a/src/win/Makefile.mingw b/src/win/Makefile.mingw index d168796ec..90f7ab19e 100644 --- a/src/win/Makefile.mingw +++ b/src/win/Makefile.mingw @@ -590,13 +590,13 @@ CXXFLAGS := $(CFLAGS) # Create the (final) list of objects to build. # ######################################################################### ifeq ($(PTHREAD), y) -MAINOBJ := 86box.o config.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \ - nmi.o pic.o pit.o port_92.o ppi.o pci.o mca.o \ +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 \ usb.o device.o nvr.o nvr_at.o nvr_ps2.o thread.o \ $(VNCOBJ) else -MAINOBJ := 86box.o config.o random.o timer.o io.o acpi.o apm.o dma.o ddma.o \ - nmi.o pic.o pit.o port_92.o ppi.o pci.o mca.o \ +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 \ usb.o device.o nvr.o nvr_at.o nvr_ps2.o \ $(VNCOBJ) endif