--- np2/win9x/Makefile	2003/12/26 23:30:26	1.13
+++ np2/win9x/Makefile	2004/01/23 15:05:06	1.17
@@ -21,6 +21,7 @@ CBUS		= ../cbus
 BIOS		= ../bios
 SOUND		= ../sound
 VERMOUTH	= ../sound/vermouth
+GETSND		= ../sound/getsnd
 VRAM		= ../vram
 FDD			= ../fdd
 LIO			= ../lio
@@ -37,14 +38,15 @@ HEADERS		=	$(TARGET)/compiler.h $(BASE)/
 
 CPUCORES	=	$(I286C)/cpucore.h $(I286C)/memory.h
 
-PCCORES		=	$(BASE)/pccore.h $(BASE)/nevent.h
+PCCORES		=	$(BASE)/pccore.h $(BASE)/nevent.h $(BASE)/statsave.h
 
 IOCORES		=	$(IO)/iocore.h $(IO)/artic.h $(IO)/cgrom.h $(IO)/cpuio.h \
 				$(IO)/crtc.h $(IO)/dipsw.h $(IO)/dmac.h $(IO)/egc.h \
-				$(IO)/extmem.h $(IO)/fdc.h $(IO)/fdd320.h $(IO)/gdc.h \
-				$(IO)/gdc_cmd.h $(IO)/gdc_sub.h $(IO)/itf.h $(IO)/mouseif.h \
-				$(IO)/nmiio.h $(IO)/np2sysp.h $(IO)/pic.h $(IO)/pit.h \
-				$(IO)/printif.h $(IO)/serial.h $(IO)/sysport.h $(IO)/upd4990.h
+				$(IO)/epsonio.h $(IO)/extmem.h $(IO)/fdc.h $(IO)/fdd320.h \
+				$(IO)/gdc.h $(IO)/gdc_cmd.h $(IO)/gdc_sub.h $(IO)/mouseif.h \
+				$(IO)/necio.h $(IO)/nmiio.h $(IO)/np2sysp.h $(IO)/pic.h \
+				$(IO)/pit.h $(IO)/printif.h $(IO)/serial.h $(IO)/sysport.h \
+				$(IO)/upd4990.h
 
 FMBOARDS	=	$(SOUND)/soundrom.h $(SOUND)/tms3631.h $(SOUND)/fmtimer.h \
 				$(SOUND)/opngen.h $(SOUND)/psggen.h $(SOUND)/rhythm.h \
@@ -59,8 +61,9 @@ COPT	= -c -Wall -pipe -O6 -fomit-frame-p
 			-fsigned-char -mno-cygwin -march=pentium \
 			-DWIN32 -DNDEBUG -D_WINDOWS \
 			-I$(BASE) -I$(COMMON) -I$(I286C) -I$(IO) -I$(CBUS) -I$(BIOS) \
-			-I$(SOUND) -I$(VERMOUTH) -I$(VRAM) -I$(FDD) -I$(LIO) -I$(FONT) \
-			-I$(GENERIC) -I$(TARGET) -I$(DIALOG) -I$(DEBUGUTY) -I$(X86ASM)
+			-I$(SOUND) -I$(VERMOUTH) -I$(GETSND) -I$(VRAM) -I$(FDD) -I$(LIO) \
+			-I$(FONT) -I$(GENERIC) -I$(TARGET) -I$(DIALOG) -I$(DEBUGUTY) \
+			-I$(X86ASM)
 LOPT	= -mno-cygwin -lstdc++
 
 NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.o		$(OBJ)/_memory.o	\
@@ -77,28 +80,31 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(OBJ)/dmac.o		$(OBJ)/egc.o		$(OBJ)/epsonio.o	\
 			$(OBJ)/extmem.o		$(OBJ)/fdc.o		$(OBJ)/fdd320.o		\
 			$(OBJ)/gdc.o		$(OBJ)/gdc_sub.o	$(OBJ)/gdc_pset.o	\
-			$(OBJ)/itf.o		$(OBJ)/mouseif.o	$(OBJ)/nmiio.o		\
+			$(OBJ)/mouseif.o	$(OBJ)/necio.o		$(OBJ)/nmiio.o		\
 			$(OBJ)/np2sysp.o	$(OBJ)/pic.o		$(OBJ)/pit.o		\
 			$(OBJ)/printif.o	$(OBJ)/serial.o		$(OBJ)/sysport.o	\
 			$(OBJ)/upd4990.o											\
-			$(OBJ)/cbuscore.o	$(OBJ)/pc9861k.o	$(OBJ)/mpu98ii.o	\
+			$(OBJ)/cbuscore.o	$(OBJ)/sasiio.o		$(OBJ)/scsiio.o		\
+			$(OBJ)/scsicmd.o	$(OBJ)/pc9861k.o	$(OBJ)/mpu98ii.o	\
 			$(OBJ)/board14.o	$(OBJ)/board26k.o	$(OBJ)/board86.o	\
 			$(OBJ)/boardx2.o	$(OBJ)/board118.o	$(OBJ)/boardspb.o	\
 			$(OBJ)/amd98.o		$(OBJ)/pcm86io.o	$(OBJ)/cs4231io.o	\
 			$(OBJ)/midiout.o	$(OBJ)/midimod.o	$(OBJ)/midinst.o	\
 			$(OBJ)/midvoice.o	$(OBJ)/midtable.o						\
+			$(OBJ)/getsnd.o		$(OBJ)/getwave.o	$(OBJ)/getsmix.o	\
 			$(OBJ)/bios.o		$(OBJ)/bios02.o		$(OBJ)/bios08.o		\
 			$(OBJ)/bios09.o		$(OBJ)/bios0c.o		$(OBJ)/bios12.o		\
 			$(OBJ)/bios13.o		$(OBJ)/bios18.o		$(OBJ)/bios19.o		\
 			$(OBJ)/bios1a.o		$(OBJ)/bios1b.o		$(OBJ)/bios1c.o		\
-			$(OBJ)/sound.o		$(OBJ)/sndcsec.o	$(OBJ)/fmboard.o	\
-			$(OBJ)/fmtimer.o	$(OBJ)/beepc.o		$(OBJ)/beepg.o		\
-			$(OBJ)/tms3631c.o	$(OBJ)/tms3631g.o	$(OBJ)/opngenc.o	\
-			$(OBJ)/opngeng.oa	$(OBJ)/psggenc.o	$(OBJ)/psggeng.o	\
-			$(OBJ)/rhythmc.o	$(OBJ)/rhythmg.o	$(OBJ)/adpcmc.o		\
-			$(OBJ)/adpcmg.o		$(OBJ)/pcm86c.o		$(OBJ)/pcm86g.o		\
-			$(OBJ)/cs4231c.o	$(OBJ)/cs4231g.o	$(OBJ)/soundrom.o	\
-			$(OBJ)/s98.o												\
+			$(OBJ)/sxsibios.o											\
+			$(OBJ)/sound.o		$(OBJ)/sndcsec.o	$(OBJ)/wavemix.o	\
+			$(OBJ)/fmboard.o	$(OBJ)/fmtimer.o	$(OBJ)/beepc.o		\
+			$(OBJ)/beepg.o		$(OBJ)/tms3631c.o	$(OBJ)/tms3631g.o	\
+			$(OBJ)/opngenc.o	$(OBJ)/opngeng.oa	$(OBJ)/psggenc.o	\
+			$(OBJ)/psggeng.o	$(OBJ)/rhythmc.o	$(OBJ)/rhythmg.o	\
+			$(OBJ)/adpcmc.o		$(OBJ)/adpcmg.o		$(OBJ)/pcm86c.o		\
+			$(OBJ)/pcm86g.o		$(OBJ)/cs4231c.o	$(OBJ)/cs4231g.o	\
+			$(OBJ)/soundrom.o	$(OBJ)/s98.o							\
 			$(OBJ)/vram.o		$(OBJ)/scrndraw.o	$(OBJ)/sdraw.o		\
 			$(OBJ)/dispsync.o	$(OBJ)/palettes.o	$(OBJ)/maketext.o	\
 			$(OBJ)/maketgrp.o	$(OBJ)/makegrph.oa	$(OBJ)/scrnbmp.o	\
@@ -112,7 +118,7 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(OBJ)/fontpc98.o	$(OBJ)/fontv98.o	$(OBJ)/fontfm7.o	\
 			$(OBJ)/fontx1.o		$(OBJ)/fontx68k.o	$(OBJ)/fontmake.o	\
 			$(OBJ)/cmndraw.o	$(OBJ)/keydisp.o	$(OBJ)/dipswbmp.o	\
-			$(OBJ)/cmjasts.o											\
+			$(OBJ)/cmjasts.o	$(OBJ)/hostdrv.o	$(OBJ)/hostdrvs.o	\
 			$(OBJ)/np2.o		$(OBJ)/np2arg.o		$(OBJ)/cputype.oa	\
 			$(OBJ)/dosio.o		$(OBJ)/extromio.o	$(OBJ)/trace.o		\
 			$(OBJ)/winloc.o		$(OBJ)/commng.o		$(OBJ)/cmserial.o	\
@@ -264,29 +270,29 @@ $(OBJ)/dmap.o		:	$(I286C)/dmap.c $(HEADE
 
 
 
-$(OBJ)/iocore.o		:	$(IO)/iocore.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I286C)/cpucore.h $(CBUS)/cbuscore.h \
-						$(SOUND)/sound.h $(CBUS)/cs4231io.h $(IO)/iocore16.tbl
+$(OBJ)/iocore.o		:	$(IO)/iocore.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(FMBOARDS) $(IO)/iocore16.tbl \
+						$(SOUND)/sound.h $(CBUS)/cs4231io.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/artic.o		:	$(IO)/artic.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h
+$(OBJ)/artic.o		:	$(IO)/artic.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/cgrom.o		:	$(IO)/cgrom.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/memory.h $(FONT)/font.h
+$(OBJ)/cgrom.o		:	$(IO)/cgrom.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(FONT)/font.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/cpuio.o		:	$(IO)/cpuio.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I286C)/cpucore.h $(SOUND)/sound.h
+$(OBJ)/cpuio.o		:	$(IO)/cpuio.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/crtc.o		:	$(IO)/crtc.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/memory.h $(VRAM)/vram.h
+$(OBJ)/crtc.o		:	$(IO)/crtc.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(VRAM)/vram.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/dipsw.o		:	$(IO)/dipsw.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/sysmng.h $(I286C)/cpucore.h \
+$(OBJ)/dipsw.o		:	$(IO)/dipsw.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(TARGET)/sysmng.h \
 						$(SOUND)/sound.h $(SOUND)/beep.h
 	$(CC) $(COPT) -o $@ $<
 
@@ -294,15 +300,16 @@ $(OBJ)/dmac.o		:	$(IO)/dmac.c $(HEADERS)
 						$(SOUND)/sound.h $(SOUND)/cs4231.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/egc.o		:	$(IO)/egc.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/memory.h $(I286C)/egcmem.h $(VRAM)/vram.h
+$(OBJ)/egc.o		:	$(IO)/egc.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(I286C)/egcmem.h $(VRAM)/vram.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/epsonio.o	:	$(IO)/epsonio.c $(HEADERS) $(PCCORES) $(IOCORES)
+$(OBJ)/epsonio.o	:	$(IO)/epsonio.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/extmem.o		:	$(IO)/extmem.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h
+$(OBJ)/extmem.o		:	$(IO)/extmem.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/fdc.o		:	$(IO)/fdc.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -312,46 +319,44 @@ $(OBJ)/fdc.o		:	$(IO)/fdc.c $(HEADERS) $
 $(OBJ)/fdd320.o		:	$(IO)/fdd320.c $(HEADERS) $(PCCORES) $(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gdc.o		:	$(IO)/gdc.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/scrnmng.h $(I286C)/cpucore.h \
-						$(I286C)/memory.h $(VRAM)/vram.h $(VRAM)/palettes.h \
-						$(IO)/gdc_cmd.tbl
+$(OBJ)/gdc.o		:	$(IO)/gdc.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(TARGET)/scrnmng.h $(IO)/gdc_cmd.tbl \
+						$(VRAM)/vram.h $(VRAM)/palettes.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gdc_sub.o	:	$(IO)/gdc_sub.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/memory.h $(IO)/gdc_pset.h $(VRAM)/vram.h
+$(OBJ)/gdc_sub.o	:	$(IO)/gdc_sub.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(IO)/gdc_pset.h $(VRAM)/vram.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gdc_pset.o	:	$(IO)/gdc_pset.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/memory.h $(IO)/gdc_pset.h $(VRAM)/vram.h
+$(OBJ)/gdc_pset.o	:	$(IO)/gdc_pset.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(IO)/gdc_pset.h $(VRAM)/vram.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/itf.o		:	$(IO)/itf.c $(HEADERS) $(PCCORES) $(IOCORES)
+$(OBJ)/mouseif.o	:	$(IO)/mouseif.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(TARGET)/mousemng.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/mouseif.o	:	$(IO)/mouseif.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/mousemng.h $(I286C)/cpucore.h
+$(OBJ)/necio.o		:	$(IO)/necio.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/nmiio.o		:	$(IO)/nmiio.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h
+$(OBJ)/nmiio.o		:	$(IO)/nmiio.c $(HEADERS) $(PCCORES) $(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/np2sysp.o	:	$(IO)/np2sysp.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(COMMON)/strres.h $(TARGET)/taskmng.h \
-						$(I286C)/cpucore.h
+$(OBJ)/np2sysp.o	:	$(IO)/np2sysp.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(COMMON)/strres.h $(TARGET)/taskmng.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/pic.o		:	$(IO)/pic.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/pit.o		:	$(IO)/pit.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(SOUND)/sound.h $(SOUND)/beep.h
+$(OBJ)/pit.o		:	$(IO)/pit.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(SOUND)/sound.h $(SOUND)/beep.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/printif.o	:	$(IO)/printif.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h
+$(OBJ)/printif.o	:	$(IO)/printif.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(TARGET)/commng.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/serial.o		:	$(IO)/serial.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -372,6 +377,23 @@ $(OBJ)/cbuscore.o	:	$(CBUS)/cbuscore.c $
 						$(CBUS)/cbuscore.h $(CBUS)/pc9861k.h $(CBUS)/mpu98ii.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/sasiio.o		:	$(CBUS)/sasiio.c $(HEADERS) $(PCCORES) $(IOCORES) \
+						$(TARGET)/dosio.h $(CBUS)/cbuscore.h \
+						$(CBUS)/sasiio.h $(FDD)/sxsi.h $(CBUS)/sasibios.res
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/scsiio.o		:	$(CBUS)/scsiio.c $(HEADERS) $(PCCORES) $(IOCORES) \
+						$(TARGET)/dosio.h $(CBUS)/cbuscore.h \
+						$(CBUS)/scsiio.h $(CBUS)/scsiio.tbl \
+						$(CBUS)/scsicmd.h $(CBUS)/scsibios.res
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/scsicmd.o	:	$(CBUS)/scsicmd.c $(HEADERS) $(PCCORES) $(IOCORES) \
+						$(TARGET)/dosio.h $(CBUS)/cbuscore.h \
+						$(CBUS)/scsiio.h $(CBUS)/scsiio.tbl \
+						$(CBUS)/scsicmd.h $(FDD)/sxsi.h
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/pc9861k.o	:	$(CBUS)/pc9861k.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(TARGET)/commng.h $(CBUS)/cbuscore.h \
 						$(CBUS)/pc9861k.h
@@ -417,107 +439,115 @@ $(OBJ)/amd98.o		:	$(CBUS)/amd98.c $(HEAD
 						$(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/pcm86io.o	:	$(CBUS)/pcm86io.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I286C)/cpucore.h $(CBUS)/pcm86io.h \
+$(OBJ)/pcm86io.o	:	$(CBUS)/pcm86io.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(FMBOARDS) $(CBUS)/pcm86io.h \
 						$(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/cs4231io.o	:	$(CBUS)/cs4231io.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(CBUS)/cs4231io.h $(SOUND)/sound.h
+$(OBJ)/cs4231io.o	:	$(CBUS)/cs4231io.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(FMBOARDS) $(CBUS)/cs4231io.h \
+						$(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
 
 
-$(OBJ)/bios.o		:	$(BIOS)/bios.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/dosio.h $(I286C)/cpucore.h \
-						$(I286C)/memory.h $(BIOS)/bios.h $(BIOS)/biosmem.h \
-						$(LIO)/lio.h $(FDD)/fddfile.h $(FDD)/fdd_mtr.h \
-						$(BIOS)/fdfmt.h $(BIOS)/keytable.res \
-						$(BIOS)/itfrom.res
+$(OBJ)/bios.o		:	$(BIOS)/bios.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(TARGET)/dosio.h $(BIOS)/bios.h \
+						$(BIOS)/biosmem.h $(BIOS)/fdfmt.h \
+						$(BIOS)/keytable.res $(BIOS)/itfrom.res \
+						$(BIOS)/startup.res $(BIOS)/biosboot.res \
+						$(LIO)/lio.h $(FDD)/fddfile.h $(FDD)/fdd_mtr.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios02.o		:	$(BIOS)/bios02.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h 
+$(OBJ)/bios02.o		:	$(BIOS)/bios02.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios08.o		:	$(BIOS)/bios08.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h
+$(OBJ)/bios08.o		:	$(BIOS)/bios08.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios09.o		:	$(BIOS)/bios09.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h
+$(OBJ)/bios09.o		:	$(BIOS)/bios09.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios0c.o		:	$(BIOS)/bios0c.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h $(BIOS)/rsbios.h
+$(OBJ)/bios0c.o		:	$(BIOS)/bios0c.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h \
+						$(BIOS)/rsbios.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios12.o		:	$(BIOS)/bios12.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h
+$(OBJ)/bios12.o		:	$(BIOS)/bios12.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios13.o		:	$(BIOS)/bios13.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h
+$(OBJ)/bios13.o		:	$(BIOS)/bios13.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios18.o		:	$(BIOS)/bios18.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h $(FONT)/font.h
+$(OBJ)/bios18.o		:	$(BIOS)/bios18.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h \
+						$(FONT)/font.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios19.o		:	$(BIOS)/bios19.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h $(BIOS)/rsbios.h
+$(OBJ)/bios19.o		:	$(BIOS)/bios19.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h \
+						$(BIOS)/rsbios.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios1a.o		:	$(BIOS)/bios1a.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h
+$(OBJ)/bios1a.o		:	$(BIOS)/bios1a.c $(HEADERS) $(CPUCORE) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios1b.o		:	$(BIOS)/bios1b.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h $(FDD)/fddfile.h $(FDD)/fdd_mtr.h \
-						$(FDD)/sxsi.h
+$(OBJ)/bios1b.o		:	$(BIOS)/bios1b.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(CBUS)scsicmd.h $(BIOS)/bios.h \
+						$(BIOS)/biosmem.h $(BIOS)/sxsibios.h \
+						$(FDD)/fddfile.h $(FDD)/fdd_mtr.h $(FDD)/sxsi.h \
+						$(BASE)/timing.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios1c.o		:	$(BIOS)/bios1c.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/timemng.h $(I286C)/cpucore.h \
-						$(I286C)/memory.h $(BASE)/calendar.h \
+$(OBJ)/bios1c.o		:	$(BIOS)/bios1c.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(TARGET)/timemng.h $(BASE)/calendar.h \
 						$(BIOS)/bios.h $(BIOS)/biosmem.h 
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/sxsibios.o	:	$(BIOS)/sxsibios.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(BIOS)/bios.h $(BIOS)/biosmem.h $(BIOS)/sxsibios.h \
+						$(CBUS)/scsicmd.h $(FDD)/sxsi.h
+	$(CC) $(COPT) -o $@ $<
+
 
 
-$(OBJ)/sound.o		:	$(SOUND)/sound.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/soundmng.h $(I286C)/cpucore.h \
-						$(SOUND)/sound.h $(SOUND)/sndcsec.h $(SOUND)/beep.h
+$(OBJ)/sound.o		:	$(SOUND)/sound.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(TARGET)/soundmng.h $(SOUND)/sound.h \
+						$(SOUND)/sndcsec.h $(SOUND)/beep.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/sndcsec.o	:	$(SOUND)/sndcsec.c $(HEADERS) $(SOUND)/sound.h \
 						$(SOUND)/sndcsec.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/wavemix.o	:	$(SOUND)/wavemix.c $(HEADERS) $(PCCORES) \
+						$(SOUND)/sound.h $(GETSND)/getsnd.h \
+						$(SOUND)/wavemix.res
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/fmboard.o	:	$(SOUND)/fmboard.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(FMBOARDS) $(TARGET)/joymng.h $(TARGET)/soundmng.h \
-						$(I286C)/cpucore.h $(CBUS)/cbuscore.h \
-						$(CBUS)/board14.h $(CBUS)/board26k.h \
-						$(CBUS)/board86.h $(CBUS)/boardx2.h \
-						$(CBUS)/board118.h $(CBUS)/boardspb.h \
-						$(CBUS)/amd98.h $(CBUS)/pcm86io.h $(CBUS)/cs4231io.h \
-						$(SOUND)/sound.h $(SOUND)/beep.h $(GENERIC)/keydisp.h
+						$(CBUS)/cbuscore.h $(CBUS)/board14.h \
+						$(CBUS)/board26k.h $(CBUS)/board86.h \
+						$(CBUS)/boardx2.h $(CBUS)/board118.h \
+						$(CBUS)/boardspb.h $(CBUS)/amd98.h $(CBUS)/pcm86io.h \
+						$(CBUS)/cs4231io.h $(SOUND)/sound.h $(SOUND)/beep.h \
+						$(GENERIC)/keydisp.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/fmtimer.o	:	$(SOUND)/fmtimer.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(SOUND)/sound.h
+$(OBJ)/fmtimer.o	:	$(SOUND)/fmtimer.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(FMBOARDS) $(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/beepc.o		:	$(SOUND)/beepc.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(SOUND)/sound.h $(SOUND)/beep.h
+$(OBJ)/beepc.o		:	$(SOUND)/beepc.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(FMBOARDS) $(SOUND)/sound.h \
+						$(SOUND)/beep.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/beepg.o		:	$(SOUND)/beepg.c $(HEADERS) $(SOUND)/sound.h \
@@ -551,8 +581,9 @@ $(OBJ)/psggeng.o	:	$(SOUND)/psggeng.c $(
 						$(SOUND)/sound.h $(SOUND)/psggen.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/rhythmc.o	:	$(SOUND)/rhythmc.c $(HEADERS) $(COMMON)/wavefile.h \
-						$(TARGET)/dosio.h $(SOUND)/sound.h $(SOUND)/rhythm.h
+$(OBJ)/rhythmc.o	:	$(SOUND)/rhythmc.c $(HEADERS) $(PCCORES) \
+						$(COMMON)/wavefile.h $(TARGET)/dosio.h \
+						$(SOUND)/sound.h $(SOUND)/rhythm.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/rhythmg.o	:	$(SOUND)/rhythmg.c $(HEADERS) $(SOUND)/sound.h \
@@ -567,8 +598,8 @@ $(OBJ)/adpcmg.o		:	$(SOUND)/adpcmg.c $(H
 						$(SOUND)/adpcm.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/pcm86c.o		:	$(SOUND)/pcm86c.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I286C)/cpucore.h $(SOUND)/sound.h
+$(OBJ)/pcm86c.o		:	$(SOUND)/pcm86c.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(FMBOARDS) $(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/pcm86g.o		:	$(SOUND)/pcm86g.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -579,12 +610,12 @@ $(OBJ)/cs4231c.o	:	$(SOUND)/cs4231c.c $(
 						$(FMBOARDS) $(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/cs4231g.o	:	$(SOUND)/cs4231g.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I286C)/memory.h $(SOUND)/sound.h
+$(OBJ)/cs4231g.o	:	$(SOUND)/cs4231g.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(FMBOARDS) $(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/soundrom.o	:	$(SOUND)/soundrom.c $(HEADERS) $(TARGET)/dosio.h \
-						$(I286C)/memory.h $(SOUND)/soundrom.h
+$(OBJ)/soundrom.o	:	$(SOUND)/soundrom.c $(HEADERS) $(CPUCORES) \
+						$(TARGET)/dosio.h $(SOUND)/soundrom.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/s98.o		:	$(SOUND)/s98.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -613,8 +644,25 @@ $(OBJ)/midtable.o	:	$(VERMOUTH)/midtable
 
 
 
-$(OBJ)/vram.o		:	$(VRAM)/vram.c $(HEADERS) $(I286C)/memory.h \
-						$(VRAM)/vram.h
+$(OBJ)/getsnd.o		:	$(GETSND)/getsnd.c $(HEADERS) $(GETSND)/getsnd.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/getwave.o	:	$(GETSND)/getwave.c $(HEADERS) $(GETSND)/getsnd.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/getmp3.o		:	$(GETSND)/getmp3.c $(HEADERS) $(GETSND)/getsnd.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/getogg.o		:	$(GETSND)/getogg.c $(HEADERS) $(GETSND)/getsnd.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/getsmix.o	:	$(GETSND)/getsmix.c $(HEADERS) $(GETSND)/getsnd.h \
+						$(GETSND)/getsndmn.mcr $(GETSND)/getsndst.mcr
+	$(CC) $(COPT) -o $@ $<
+
+
+
+$(OBJ)/vram.o		:	$(VRAM)/vram.c $(HEADERS) $(CPUCORES) $(VRAM)/vram.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/scrndraw.o	:	$(VRAM)/scrndraw.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -627,9 +675,14 @@ $(OBJ)/sdraw.o		:	$(VRAM)/sdraw.c $(HEAD
 						$(VRAM)/palettes.h $(VRAM)/sdraw.mcr
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/dispsync.o	:	$(VRAM)/dispsync.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/scrnmng.h $(I286C)/memory.h \
-						$(VRAM)/scrndraw.h $(VRAM)/dispsync.h
+$(OBJ)/sdrawq16.o	:	$(VRAM)/sdrawq16.c $(HEADERS) $(TARGET)/scrnmng.h \
+						$(VRAM)/scrndraw.h $(VRAM)/sdraw.h \
+						$(VRAM)/palettes.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/dispsync.o	:	$(VRAM)/dispsync.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(TARGET)/scrnmng.h $(VRAM)/scrndraw.h \
+						$(VRAM)/dispsync.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/palettes.o	:	$(VRAM)/palettes.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -637,20 +690,20 @@ $(OBJ)/palettes.o	:	$(VRAM)/palettes.c $
 						$(VRAM)/palettes.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/maketext.o	:	$(VRAM)/maketext.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/memory.h $(VRAM)/vram.h $(VRAM)/scrndraw.h \
+$(OBJ)/maketext.o	:	$(VRAM)/maketext.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(VRAM)/vram.h $(VRAM)/scrndraw.h \
 						$(VRAM)/dispsync.h $(VRAM)/maketext.h $(FONT)/font.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/maketgrp.o	:	$(VRAM)/maketgrp.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/memory.h $(VRAM)/vram.h $(VRAM)/scrndraw.h \
+$(OBJ)/maketgrp.o	:	$(VRAM)/maketgrp.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(VRAM)/vram.h $(VRAM)/scrndraw.h \
 						$(VRAM)/dispsync.h $(VRAM)/palettes.h \
 						$(VRAM)/maketext.h $(VRAM)/maketgrp.h \
-						$(VRAM)/makegrph.h $(FONT)/font.h $(VRAM)/makegrph.mcr
+						$(VRAM)/makegrph.h $(VRAM)/makegrph.mcr $(FONT)/font.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/makegrph.o	:	$(VRAM)/makegrph.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/memory.h $(VRAM)/vram.h $(VRAM)/scrndraw.h \
+$(OBJ)/makegrph.o	:	$(VRAM)/makegrph.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(VRAM)/vram.h $(VRAM)/scrndraw.h \
 						$(VRAM)/dispsync.h $(VRAM)/makegrph.h \
 						$(VRAM)/makegrph.mcr
 	$(CC) $(COPT) -o $@ $<
@@ -672,7 +725,8 @@ $(OBJ)/diskdrv.o	:	$(FDD)/diskdrv.c $(HE
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/newdisk.o	:	$(FDD)/newdisk.c $(HEADERS) $(TARGET)/dosio.h \
-						$(FDD)/newdisk.h $(FDD)/fddfile.h
+						$(FDD)/newdisk.h $(FDD)/fddfile.h $(FDD)/sxsi.h
+						$(FDD)/hddboot.res
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/fddfile.o	:	$(FDD)/fddfile.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -690,87 +744,85 @@ $(OBJ)/fdd_d88.o	:	$(FDD)/fdd_d88.c $(HE
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/fdd_mtr.o	:	$(FDD)/fdd_mtr.c $(HEADERS) $(PCCORES) \
-						$(TARGET)/soundmng.h $(FDD)/fdd_mtr.h
+						$(TARGET)/soundmng.h $(SOUND)/wavemix.h \
+						$(FDD)/fdd_mtr.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/sxsi.o		:	$(FDD)/sxsi.c $(HEADERS) $(PCCORES) \
-						$(TARGET)/sysmng.h $(I286C)/cpucore.h $(FDD)/sxsi.h
+$(OBJ)/sxsi.o		:	$(FDD)/sxsi.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(COMMON)/strres.h $(TARGET)/dosio.h \
+						$(TARGET)/sysmng.h $(FDD)/sxsi.h
 	$(CC) $(COPT) -o $@ $<
 
 
 
-$(OBJ)/lio.o		:	$(LIO)/lio.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h $(VRAM)/vram.h $(LIO)/lio.h
+$(OBJ)/lio.o		:	$(LIO)/lio.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h \
+						$(VRAM)/vram.h $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gscreen.o	:	$(LIO)/gscreen.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(LIO)/lio.h
+$(OBJ)/gscreen.o	:	$(LIO)/gscreen.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gview.o		:	$(LIO)/gview.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(LIO)/lio.h
+$(OBJ)/gview.o		:	$(LIO)/gview.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gcolor1.o	:	$(LIO)/gcolor1.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(LIO)/lio.h
+$(OBJ)/gcolor1.o	:	$(LIO)/gcolor1.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gcolor2.o	:	$(LIO)/gcolor2.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/cpucore.h $(I286C)/memory.h $(LIO)/lio.h
+$(OBJ)/gcolor2.o	:	$(LIO)/gcolor2.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gcls.o		:	$(LIO)/gcls.c $(HEADERS) $(I286C)/cpucore.h \
-						$(I286C)/memory.h $(LIO)/lio.h
+$(OBJ)/gcls.o		:	$(LIO)/gcls.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gpset.o		:	$(LIO)/gpset.c $(HEADERS) $(I286C)/cpucore.h \
-						$(I286C)/memory.h $(LIO)/lio.h
+$(OBJ)/gpset.o		:	$(LIO)/gpset.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gline.o		:	$(LIO)/gline.c $(HEADERS) $(I286C)/cpucore.h \
-						$(I286C)/memory.h $(LIO)/lio.h
+$(OBJ)/gline.o		:	$(LIO)/gline.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gput1.o		:	$(LIO)/gput1.c $(HEADERS) $(I286C)/cpucore.h \
-						$(I286C)/memory.h $(LIO)/lio.h
+$(OBJ)/gput1.o		:	$(LIO)/gput1.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
 
 
-$(OBJ)/font.o		:	$(FONT)/font.c $(HEADERS) $(COMMON)/strres.h \
-						$(TARGET)/dosio.h $(I286C)/memory.h $(FONT)/font.h \
+$(OBJ)/font.o		:	$(FONT)/font.c $(HEADERS) $(CPUCORES) \
+						$(COMMON)/strres.h $(TARGET)/dosio.h $(FONT)/font.h \
 						$(FONT)/fontdata.h $(FONT)/fontmake.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/fontdata.o	:	$(FONT)/fontdata.c $(HEADERS) $(I286C)/memory.h \
+$(OBJ)/fontdata.o	:	$(FONT)/fontdata.c $(HEADERS) $(CPUCORES) \
 						$(FONT)/font.h $(FONT)/fontdata.h $(FONT)/fontdata.res
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/fontpc88.o	:	$(FONT)/fontpc88.c $(HEADERS) $(TARGET)/dosio.h \
-						$(I286C)/memory.h $(FONT)/font.h $(FONT)/fontdata.h
+$(OBJ)/fontpc88.o	:	$(FONT)/fontpc88.c $(HEADERS) $(CPUCORES) \
+						$(TARGET)/dosio.h $(FONT)/font.h $(FONT)/fontdata.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/fontpc98.o	:	$(FONT)/fontpc98.c $(HEADERS) $(COMMON)/bmpdata.h \
-						$(TARGET)/dosio.h $(I286C)/memory.h $(FONT)/font.h \
-						$(FONT)/fontdata.h
+$(OBJ)/fontpc98.o	:	$(FONT)/fontpc98.c $(HEADERS) $(CPUCORES) \
+						$(COMMON)/bmpdata.h $(TARGET)/dosio.h \
+						$(FONT)/font.h $(FONT)/fontdata.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/fontv98.o	:	$(FONT)/fontv98.c $(HEADERS) $(TARGET)/dosio.h \
-						$(I286C)/memory.h $(FONT)/font.h $(FONT)/fontdata.h
+$(OBJ)/fontv98.o	:	$(FONT)/fontv98.c $(HEADERS) $(CPUCORES) \
+						$(TARGET)/dosio.h $(FONT)/font.h $(FONT)/fontdata.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/fontfm7.o	:	$(FONT)/fontfm7.c $(HEADERS) $(TARGET)/dosio.h \
-						$(I286C)/memory.h $(FONT)/font.h $(FONT)/fontdata.h
+$(OBJ)/fontfm7.o	:	$(FONT)/fontfm7.c $(HEADERS) $(CPUCORES) \
+						$(TARGET)/dosio.h $(FONT)/font.h $(FONT)/fontdata.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/fontx1.o		:	$(FONT)/fontx1.c $(HEADERS) $(COMMON)/parts.h \
-						$(TARGET)/dosio.h $(I286C)/memory.h $(FONT)/font.h \
+$(OBJ)/fontx1.o		:	$(FONT)/fontx1.c $(HEADERS) $(CPUCORES) \
+						$(COMMON)/parts.h $(TARGET)/dosio.h $(FONT)/font.h \
 						$(FONT)/fontdata.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/fontx68k.o	:	$(FONT)/fontx68k.c $(HEADERS) $(TARGET)/dosio.h \
-						$(I286C)/memory.h $(FONT)/font.h $(FONT)/fontdata.h
+$(OBJ)/fontx68k.o	:	$(FONT)/fontx68k.c $(HEADERS) $(CPUCORES) \
+						$(TARGET)/dosio.h $(FONT)/font.h $(FONT)/fontdata.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/fontmake.o	:	$(FONT)/fontmake.c $(HEADERS) $(COMMON)/bmpdata.h \
@@ -787,19 +839,33 @@ $(OBJ)/cmndraw.o	:	$(GENERIC)/cmndraw.c 
 
 $(OBJ)/keydisp.o	:	$(GENERIC)/keydisp.c $(HEADERS) $(PCCORES) \
 						$(IOCORES) $(FMBOARDS) $(SOUND)/sound.h \
-						$(GENERIC)/cmndraw.h $(GENERIC)/keydisp.h \
-						$(GENERIC)/keydisp.res
+						$(GENERIC)/keydisp.h $(GENERIC)/keydisp.res
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/dipswbmp.o	:	$(GENERIC)/dipswbmp.c $(HEADERS) $(COMMON)/bmpdata.h \
 						$(GENERIC)/dipswbmp.h $(GENERIC)/dipswbmp.res
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/cmver.o		:	$(GENERIC)/cmver.c $(HEADERS) $(TARGET)/commng.h \
+						$(SOUND)/sound.h $(VERMOUTH)/vermouth.h \
+						$(GENERIC)/keydisp.h $(GENERIC)/cmver.h
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/cmjasts.o	:	$(GENERIC)/cmjasts.c $(HEADERS) $(CPUCORES) \
 						$(TARGET)/commng.h $(SOUND)/sound.h \
 						$(GENERIC)/cmjasts.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/hostdrv.o	:	$(GENERIC)/hostdrv.c $(HEADERS) $(CPUCORES) \
+						$(PCCORES) $(IOCORES) $(GENERIC)/hostdrv.h \
+						$(GENERIC)/hostdrv.tbl $(GENERIC)/hostdrvs.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/hostdrvs.o	:	$(GENERIC)/hostdrvs.c $(HEADERS) $(PCCORES) \
+						$(COMMON)/codecnv.h $(TARGET)/dosio.h \
+						$(GENERIC)/hostdrv.h $(GENERIC)/hostdrvs.h
+	$(CC) $(COPT) -o $@ $<
+
 
 
 $(OBJ)/np2.o		:	$(TARGET)/np2.cpp $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -818,7 +884,7 @@ $(OBJ)/np2.o		:	$(TARGET)/np2.cpp $(HEAD
 						$(CBUS)/mpu98ii.h $(BIOS)/bios.h $(VRAM)/scrndraw.h \
 						$(SOUND)/sound.h $(SOUND)/beep.h $(SOUND)/s98.h \
 						$(FDD)/diskdrv.h $(FDD)/fddfile.h $(BASE)/timing.h \
-						$(BASE)/statsave.h $(BASE)/debugsub.h \
+						$(BASE)/debugsub.h \
 						$(GENERIC)/keydisp.h $(DEBUGUTY)/viewer.h
 	$(CC) $(COPT) -o $@ $<
 
@@ -1108,18 +1174,20 @@ $(OBJ)/unasm.o		:	$(DEBUGUTY)/unasm.cpp 
 
 
 
-$(OBJ)/pccore.o		:	$(BASE)/pccore.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/soundmng.h $(TARGET)/sysmng.h \
-						$(TARGET)/timemng.h $(I286C)/cpucore.h \
-						$(I286C)/memory.h $(CBUS)/cbuscore.h \
-						$(CBUS)/pc9861k.h $(CBUS)/mpu98ii.h $(BIOS)/bios.h \
+$(OBJ)/pccore.o		:	$(BASE)/pccore.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(FMBOARDS) $(COMMON)/strres.h \
+						$(TARGET)/dosio.h $(TARGET)/soundmng.h \
+						$(TARGET)/sysmng.h $(TARGET)/timemng.h \
+						$(CBUS)/cbuscore.h $(CBUS)/pc9861k.h \
+						$(CBUS)/mpu98ii.h $(BIOS)/bios.h $(BIOS)/biosmem.h \
 						$(VRAM)/vram.h $(VRAM)/scrndraw.h $(VRAM)/dispsync.h \
 						$(VRAM)/palettes.h $(VRAM)/maketext.h \
 						$(VRAM)/maketgrp.h $(VRAM)/makegrph.h \
-						$(SOUND)/sound.h $(SOUND)/fmboard.h $(SOUND)/beep.h \
+						$(SOUND)/sound.h $(SOUND)/beep.h $(SOUND)/s98.h \
 						$(FONT)/font.h $(FDD)/diskdrv.h $(FDD)/fddfile.h \
-						$(FDD)/fdd_mtr.h $(FDD)/sxsi.h $(BASE)/calendar.h \
-						$(BASE)/timing.h
+						$(FDD)/fdd_mtr.h $(FDD)/sxsi.h $(GENERIC)/hostdrv.h \
+						$(BASE)/np2ver.h $(BASE)/calendar.h $(BASE)/timing.h \
+						$(BASE)/debugsub.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/nevent.o		:	$(BASE)/nevent.c $(HEADERS) $(PCCORES) \
@@ -1145,8 +1213,7 @@ $(OBJ)/statsave.o	:	$(BASE)/statsave.c $
 						$(VRAM)/palettes.h $(VRAM)/maketext.h \
 						$(SOUND)/sound.h $(SOUND)/fmboard.h $(SOUND)/beep.h \
 						$(FONT)/font.h $(FDD)/fddfile.h $(FDD)/fdd_mtr.h \
-						$(FDD)/sxsi.h $(BASE)/calendar.h $(BASE)/statsave.h \
-						$(GENERIC)/keydisp.h
+						$(FDD)/sxsi.h $(BASE)/calendar.h $(GENERIC)/keydisp.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/debugsub.o	:	$(BASE)/debugsub.c $(HEADERS) $(PCCORES) $(IOCORES) \