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

Merge remote-tracking branch 'origin/master' into feature/machine_and_kb

Browse Source
This commit is contained in:
OBattler
2021-09-26 22:52:33 +02:00
parent 5ad606a8f2 fe48e3b36d
commit 5231ab4e44
6 changed files with 710 additions and 634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/win/Makefile.mingw
View File

@@ -69,9 +69,6 @@ ifeq ($(DEV_BUILD), y)
ifndef PS2M70T4
PS2M70T4 := y
endif
ifndef S3TRIO3D2X
S3TRIO3D2X := y
endif
ifndef SIO_DETECT
SIO_DETECT := y
endif
@@ -136,9 +133,6 @@ else
ifndef PS2M70T4
PS2M70T4 := n
endif
ifndef S3TRIO3D2X
S3TRIO3D2X := n
endif
ifndef SIO_DETECT
SIO_DETECT := n
endif
@@ -545,10 +539,6 @@ ifeq ($(PS2M70T4), y)
OPTS += -DUSE_PS2M70T4
endif
ifeq ($(S3TRIO3D2X), y)
OPTS += -DUSE_S3TRIO3D2X
endif
ifeq ($(SIO_DETECT), y)
OPTS += -DUSE_SIO_DETECT
DEVBROBJ += sio_detect.o