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

All devices now have the bus marked in their name;

Browse Source 
The Settings dialog now correctly filters devices by bus;
Split the dual VLB/PCI graphics cards into VLB and PCI versions;
Device filtering is now done using the new device_is_valid() call that compares device flags to machine flags;
Moved the NCR-based SCSI controllers to the main branch;
Moved the NE1000 to the dev branch until it's finished.
This commit is contained in:
OBattler
2017-10-10 00:14:15 +02:00
parent efc129eb22
commit 253ad40376
55 changed files with 852 additions and 427 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Makefile.mingw
View File

@@ -68,8 +68,8 @@ endif
ifndef CIRRUS
CIRRUS := n
endif
ifndef NCR_SCSI
NCR_SCSI := n
ifndef NE1000
NE1000 := n
endif
ifndef NV_RIVA
NV_RIVA := n
@@ -90,7 +90,7 @@ endif
ifeq ($(DEV_BUILD), y)
DEV_BRANCH := y
CIRRUS := y
NCR_SCSI := y
NE1000 := y
NV_RIVA := y
PAS16 := y
endif
@@ -205,9 +205,8 @@ CFLAGS += -DUSE_CIRRUS
DEVBROBJ += vid_cl_gd.o vid_cl_gd_blit.o vid_cl_ramdac.o
endif
ifeq ($(NCR_SCSI), y)
CFLAGS += -DUSE_NCR
DEVBROBJ += scsi_bus.o scsi_ncr5380.o
ifeq ($(NE1000), y)
CFLAGS += -DUSE_NE1000
endif
ifeq ($(NV_RIVA), y)
@@ -296,8 +295,9 @@ USBOBJ := usb.o
endif
SCSIOBJ := scsi.o \
scsi_bios_command.o scsi_device.o scsi_disk.o \
scsi_buslogic.o scsi_aha154x.o
scsi_bios_command.o scsi_bus.o scsi_device.o scsi_disk.o \
scsi_buslogic.o scsi_aha154x.o \
scsi_ncr5380.o
NETOBJ := network.o \
net_pcap.o \