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

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

Browse Source
This commit is contained in:
EngiNerd89
2021-02-11 20:10:43 +01:00
parent a2c53e1a94 c65777c309
commit 56f794e66c
25 changed files with 257 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/win/Makefile.mingw
View File

@@ -75,9 +75,6 @@ ifeq ($(DEV_BUILD), y)
ifndef SIO_DETECT
SIO_DETECT := y
endif
ifndef STPC
STPC := y
endif
ifndef M1489
M1489 := y
endif
@@ -154,9 +151,6 @@ else
ifndef SIO_DETECT
SIO_DETECT := n
endif
ifndef STPC
STPC := y
endif
ifndef M1489
M1489 := n
endif
@@ -555,11 +549,6 @@ OPTS += -DUSE_SIO_DETECT
DEVBROBJ += sio_detect.o
endif
ifeq ($(STPC), y)
OPTS += -DUSE_STPC
DEVBROBJ += stpc.o
endif
ifeq ($(M1489), y)
OPTS += -DUSE_M1489
DEVBROBJ += ali1489.o
@@ -629,9 +618,8 @@ CPUOBJ := cpu.o cpu_table.o \
CHIPSETOBJ := acc2168.o cs8230.o ali1217.o ali1429.o headland.o intel_82335.o cs4031.o \
intel_420ex.o intel_4x0.o intel_sio.o intel_piix.o ioapic.o \
neat.o opti495.o opti895.o opti5x7.o scamp.o scat.o via_vt82c49x.o via_vt82c505.o \
sis_85c310.o sis_85c4xx.o sis_85c496.o sis_85c50x.o opti283.o opti291.o \
gc100.o \
olivetti_eva.o \
gc100.o olivetti_eva.o \
sis_85c310.o sis_85c4xx.o sis_85c496.o sis_85c50x.o stpc.o opti283.o opti291.o \
via_apollo.o via_pipc.o wd76c10.o vl82c480.o
MCHOBJ := machine.o machine_table.o \