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

src/win/Makefile.mingw

@@ -84,6 +84,9 @@ ifeq ($(DEV_BUILD), y)
  ifndef M6117
   M6117		:= y
  endif
+ ifndef SIS_5571
+  SIS_5571	:= y
+ endif
  ifndef VGAWONDER
   VGAWONDER	:= y
  endif
@@ -154,6 +157,9 @@ else
  ifndef M6117
   M6117		:= n
  endif
+ ifndef SIS_5571
+  SIS_5571	:= n
+ endif
  ifndef VGAWONDER
   VGAWONDER	:= n
  endif
@@ -312,7 +318,7 @@ DEPFILE		:= win/.depends
 
 # Set up the correct toolchain flags.
 OPTS		:= $(EXTRAS) $(STUFF)
-OPTS		+= -Iinclude \
+OPTS		+= -Iinclude -Iinclude_make \
 		   -iquote $(CODEGEN) -iquote cpu
 ifdef EXFLAGS
 OPTS		+= $(EXFLAGS)
@@ -363,7 +369,7 @@ ifeq ($(ARM64), y)
  AOPTIM		:=
  AFLAGS		:= -mfloat-abi=hard
 endif
-RFLAGS		:= --input-format=rc -O coff -Iinclude
+RFLAGS		:= --input-format=rc -O coff -Iinclude -Iinclude_make
 ifeq ($(RELEASE), y)
 OPTS		+= -DRELEASE_BUILD
 RFLAGS		+= -DRELEASE_BUILD
@@ -552,6 +558,11 @@ OPTS		+= -DUSE_M6117
 DEVBROBJ	+= ali6117.o
 endif
 
+ifeq ($(SIS_5571), y)
+OPTS		+= -DUSE_SIS_5571
+DEVBROBJ	+= sis_5571.o
+endif
+
 ifeq ($(VGAWONDER), y)
 OPTS		+= -DUSE_VGAWONDER
 endif
@@ -628,8 +639,9 @@ DEVOBJ		:= bugger.o hwm.o hwm_lm75.o hwm_lm78.o hwm_gl518sm.o hwm_vt82c686.o ibm
 
 SIOOBJ		:= sio_acc3221.o \
 		    sio_f82c710.o sio_82091aa.o \
-		    sio_fdc37c661.o sio_fdc37c66x.o sio_fdc37c669.o sio_fdc37c93x.o \
-		    sio_pc87306.o sio_pc87307.o sio_pc87309.o sio_pc87332.o \
+		    sio_fdc37c661.o sio_fdc37c66x.o sio_fdc37c669.o sio_fdc37c93x.o sio_fdc37m60x.o \
+		    sio_pc87306.o sio_pc87307.o sio_pc87309.o sio_pc87311.o sio_pc87332.o \
+			sio_prime3c.o \
 		    sio_w83787f.o \
 		    sio_w83877f.o sio_w83977f.o \
 		    sio_um8669f.o \