And back.
This commit is contained in:
@@ -14,8 +14,8 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
# WIN32 marks us as a GUI app on Windows
|
# 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
|
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_92.c ppi.c pci.c mca.c usb.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)
|
device.c nvr.c nvr_at.c nvr_ps2.c thread.c)
|
||||||
|
|
||||||
if(NEW_DYNAREC)
|
if(NEW_DYNAREC)
|
||||||
|
@@ -590,13 +590,13 @@ CXXFLAGS := $(CFLAGS)
|
|||||||
# Create the (final) list of objects to build. #
|
# Create the (final) list of objects to build. #
|
||||||
#########################################################################
|
#########################################################################
|
||||||
ifeq ($(PTHREAD), y)
|
ifeq ($(PTHREAD), y)
|
||||||
MAINOBJ := 86box.o config.o random.o timer.o io.o acpi.o apm.o dma.o ddma.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_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 \
|
||||||
usb.o device.o nvr.o nvr_at.o nvr_ps2.o thread.o \
|
usb.o device.o nvr.o nvr_at.o nvr_ps2.o thread.o \
|
||||||
$(VNCOBJ)
|
$(VNCOBJ)
|
||||||
else
|
else
|
||||||
MAINOBJ := 86box.o config.o random.o timer.o io.o acpi.o apm.o dma.o ddma.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_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 \
|
||||||
usb.o device.o nvr.o nvr_at.o nvr_ps2.o \
|
usb.o device.o nvr.o nvr_at.o nvr_ps2.o \
|
||||||
$(VNCOBJ)
|
$(VNCOBJ)
|
||||||
endif
|
endif
|
||||||
|
Reference in New Issue
Block a user