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

Merge branch 'master' into audio

Browse Source
This commit is contained in:
Jasmine Iwanek
2022-01-26 19:59:37 -05:00
parent ffc89a99eb 8cfa086c5a
commit d8761e869a
25 changed files with 1583 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/win/Makefile.mingw
View File

@@ -69,6 +69,12 @@ ifeq ($(DEV_BUILD), y)
ifndef XL24
XL24 := y
endif
ifndef ISAMEM_RAMPAGE
ISAMEM_RAMPAGE := y
endif
ifndef ISAMEM_IAB
ISAMEM_IAB := y
endif
ifndef OLIVETTI
OLIVETTI := y
endif
@@ -118,6 +124,12 @@ else
ifndef XL24
XL24 := n
endif
ifndef ISAMEM_RAMPAGE
ISAMEM_RAMPAGE := n
endif
ifndef ISAMEM_IAB
ISAMEM_IAB := n
endif
ifndef OLIVETTI
OLIVETTI := n
endif
@@ -450,6 +462,14 @@ ifeq ($(XL24), y)
OPTS += -DUSE_XL24
endif
ifeq ($(ISAMEM_RAMPAGE), y)
OPTS += -DUSE_ISAMEM_RAMPAGE
endif
ifeq ($(ISAMEM_IAB), y)
OPTS += -DUSE_ISAMEM_IAB
endif
ifeq ($(OLIVETTI), y)
OPTS += -DUSE_OLIVETTI
DEVBROBJ += olivetti_eva.o