mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-26 05:53:15 -07:00
Code Issues Packages Projects Releases Activity

Merge remote-tracking branch 'upstream/master' into feature/ich2

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-04-27 21:51:10 -04:00
parent dac5ab5393 78a897f07a
commit 05d1dbf205
39 changed files with 3120 additions and 2925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/win/Makefile.mingw
View File

@@ -209,6 +209,9 @@ endif
ifndef MINITRACE
MINITRACE := n
endif
ifndef AVX
AVX := n
endif
ifeq ($(DYNAREC), y)
ifeq ($(ARM), y)
ifeq ($(NEW_DYNAREC), n)
@@ -314,7 +317,11 @@ else
endif
endif
endif
AFLAGS := -msse2 -mfpmath=sse
ifeq ($(AVX), y)
AFLAGS := -msse2 -msse3 -mssse3 -msse4 -msse4a -mavx -mavx2 -mfpmath=sse
else
AFLAGS := -msse2 -mfpmath=sse
endif
ifeq ($(ARM), y)
DFLAGS := -march=armv7-a
AOPTIM :=
@@ -583,11 +590,8 @@ MCHOBJ := machine.o machine_table.o \
m_at_socket8.o m_at_slot1.o m_at_slot2.o m_at_socket370.o \
m_at_misc.o
ifeq ($(NEW_KBC), y)
KBCOBJ := kbc_at.o kbd_at.o
else
KBCOBJ := keyboard_at.o
endif
KBCOBJ := kbc_at.o kbc_at_dev.o \
keyboard_at.o
DEVOBJ := bugger.o cartridge.o cassette.o hasp.o hwm.o hwm_lm75.o hwm_lm78.o hwm_gl518sm.o hwm_nsc366.o hwm_vt82c686.o \
ibm_5161.o isamem.o isartc.o lpt.o pci_bridge.o postcard.o serial.o \