--- np2/win9x/Makefile	2004/01/25 05:41:29	1.20
+++ np2/win9x/Makefile	2006/12/17 02:30:11	1.32
@@ -1,5 +1,5 @@
 # makefile for cygwin
-#   gcc version 3.2 20020927 (prerelease)
+#   gcc version 3.3.3
 
 
 AS		= nasmw
@@ -15,7 +15,9 @@ BIN		= $(BINBASE)/cygwin
 
 BASE		= ..
 COMMON		= ../common
+CODECNV		= ../codecnv
 I286C		= ../i286c
+MEM			= ../mem
 IO			= ../io
 CBUS		= ../cbus
 BIOS		= ../bios
@@ -27,11 +29,16 @@ FDD			= ../fdd
 LIO			= ../lio
 FONT		= ../font
 GENERIC		= ../generic
+ZLIB		= ../zlib
 TARGET		= .
 X86ASM		= ./x86
 DIALOG		= ./dialog
 DEBUGUTY	= ./debuguty
 
+I286CASM	= $(I286C)/x86
+IOASM		= $(IO)/x86
+VRAMASM		= $(VRAM)/x86
+
 HEADERS		=	$(TARGET)/compiler.h $(BASE)/common.h $(COMMON)/milstr.h \
 				$(COMMON)/_memory.h $(COMMON)/rect.h $(COMMON)/lstarray.h \
 				$(TARGET)/trace.h
@@ -56,90 +63,115 @@ VERMOUTHS	=	$(VERMOUTH)/midiout.h $(VERM
 				$(VERMOUTH)/midinst.h $(VERMOUTH)/midvoice.h \
 				$(VERMOUTH)/midtable.h
 
+ZLIBS		=	$(ZLIB)/crc32.h $(ZLIB)/inffast.h $(ZLIB)/inffixed.h \
+				$(ZLIB)/inflate.h $(ZLIB)/inftrees.h $(ZLIB)/zconf.h \
+				$(ZLIB)/zlib.h $(ZLIB)/zutil.h
+
+
 AOPT	= -f win32
 COPT	= -c -Wall -pipe -O6 -fomit-frame-pointer -fkeep-inline-functions \
 			-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$(GETSND) -I$(VRAM) -I$(FDD) -I$(LIO) \
-			-I$(FONT) -I$(GENERIC) -I$(TARGET) -I$(DIALOG) -I$(DEBUGUTY) \
-			-I$(X86ASM)
+			-I$(BASE) -I$(COMMON) -I$(CODECNV) -I$(I286C) -I$(MEM) -I$(IO) \
+			-I$(CBUS) -I$(BIOS) -I$(LIO) -I$(VRAM) -I$(SOUND) -I$(VERMOUTH) \
+			-I$(GETSND) -I$(FDD) -I$(FONT) -I$(GENERIC) -I$(TARGET) \
+			-I$(DIALOG) -I$(DEBUGUTY) -I$(X86ASM) -I$(ZLIB)
 LOPT	= -mno-cygwin -lstdc++
 
 NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.o		$(OBJ)/_memory.o	\
 			$(OBJ)/textfile.o	$(OBJ)/profile.o	$(OBJ)/rect.o		\
 			$(OBJ)/lstarray.o	$(OBJ)/bmpdata.o	$(OBJ)/mimpidef.o	\
-			$(OBJ)/parts.oa												\
+			$(OBJ)/parts.oa		$(OBJ)/arc.o		$(OBJ)/arcunzip.o	\
+			\
+			$(OBJ)/adler32.o	$(OBJ)/crc32.o		$(OBJ)/inffast.o	\
+			$(OBJ)/inflate.o	$(OBJ)/inftrees.o	$(OBJ)/zutil.o		\
+			\
+			$(OBJ)/utf8ucs2.o	$(OBJ)/ucs2utf8.o	$(OBJ)/tcswap16.o	\
+			\
 			$(OBJ)/i286c.o		$(OBJ)/i286c_mn.o	$(OBJ)/i286c_ea.o	\
 			$(OBJ)/i286c_0f.o	$(OBJ)/i286c_8x.o	$(OBJ)/i286c_sf.o	\
 			$(OBJ)/i286c_f6.o	$(OBJ)/i286c_fe.o	$(OBJ)/i286c_rp.o	\
-			$(OBJ)/v30patch.o	$(OBJ)/memory.o		$(OBJ)/egcmem.o		\
-			$(OBJ)/dmap.o												\
+			$(OBJ)/v30patch.o	$(OBJ)/memory.o							\
+			\
+			$(OBJ)/dmax86.o		$(OBJ)/dmav30.o		$(OBJ)/memtram.o	\
+			$(OBJ)/memvram.o	$(OBJ)/memegc.o		$(OBJ)/memems.o		\
+			$(OBJ)/memepp.o												\
+			\
 			$(OBJ)/iocore.o		$(OBJ)/artic.o		$(OBJ)/cgrom.o		\
 			$(OBJ)/cpuio.o		$(OBJ)/crtc.o		$(OBJ)/dipsw.o		\
-			$(OBJ)/dmac.o		$(OBJ)/egc.o		$(OBJ)/epsonio.o	\
-			$(OBJ)/emsio.o		$(OBJ)/fdc.o		$(OBJ)/fdd320.o		\
+			$(OBJ)/dmac.o		$(OBJ)/egc.o		$(OBJ)/emsio.o		\
+			$(OBJ)/epsonio.o	$(OBJ)/fdc.o		$(OBJ)/fdd320.o		\
 			$(OBJ)/gdc.o		$(OBJ)/gdc_sub.o	$(OBJ)/gdc_pset.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)/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)/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)/bios.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)/bios1f.o		$(OBJ)/sxsibios.o	\
+			$(OBJ)/lio.o		$(OBJ)/gscreen.o	$(OBJ)/gpset.o		\
+			$(OBJ)/gline.o		$(OBJ)/gcircle.o	$(OBJ)/gput1.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	\
+			$(OBJ)/maketgrp.o	$(OBJ)/makegrph.oa	$(OBJ)/scrnsave.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)/adpcmc.o		$(OBJ)/adpcmg.o		\
+			$(OBJ)/pcm86c.o		$(OBJ)/pcm86g.o		$(OBJ)/cs4231c.o	\
+			$(OBJ)/cs4231g.o	$(OBJ)/soundrom.o	$(OBJ)/s98.o		\
+			\
+			$(OBJ)/getsnd.o		$(OBJ)/getwave.o	$(OBJ)/getsmix.o	\
+			\
+			$(OBJ)/midiout.o	$(OBJ)/midimod.o	$(OBJ)/midinst.o	\
+			$(OBJ)/midvoice.o	$(OBJ)/midtable.o						\
+			\
 			$(OBJ)/diskdrv.o	$(OBJ)/newdisk.o	$(OBJ)/fddfile.o	\
 			$(OBJ)/fdd_xdf.o	$(OBJ)/fdd_d88.o	$(OBJ)/fdd_mtr.o	\
-			$(OBJ)/sxsi.o												\
-			$(OBJ)/lio.o		$(OBJ)/gscreen.o	$(OBJ)/gview.o		\
-			$(OBJ)/gcolor1.o	$(OBJ)/gcolor2.o	$(OBJ)/gcls.o		\
-			$(OBJ)/gpset.o		$(OBJ)/gline.o		$(OBJ)/gput1.o		\
+			$(OBJ)/sxsi.o		$(OBJ)/sxsihdd.o	$(OBJ)/sxsicd.o		\
+			\
 			$(OBJ)/font.o		$(OBJ)/fontdata.o	$(OBJ)/fontpc88.o	\
 			$(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)/hostdrv.o	$(OBJ)/hostdrvs.o	\
+			\
+			$(OBJ)/cmndraw.o	$(OBJ)/keydisp.o	$(OBJ)/softkbd.o	\
+			$(OBJ)/dipswbmp.o	$(OBJ)/cmjasts.o	$(OBJ)/hostdrv.o	\
+			$(OBJ)/hostdrvs.o	$(OBJ)/unasm.o		$(OBJ)/np2info.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	\
-			$(OBJ)/cmmidi.o		$(OBJ)/cmpara.o		$(OBJ)/fontmng.o	\
-			$(OBJ)/joymng.o		$(OBJ)/mousemng.o	$(OBJ)/scrnmng.o	\
-			$(OBJ)/soundmng.o	$(OBJ)/sysmng.o		$(OBJ)/taskmng.o	\
-			$(OBJ)/timemng.o	$(OBJ)/juliet.o		$(OBJ)/sstp.o		\
-			$(OBJ)/sstpmsg.o	$(OBJ)/winkbd.o		$(OBJ)/dclock.o		\
-			$(OBJ)/dclockd.o	$(OBJ)/menu.o		$(OBJ)/ini.o		\
-			$(OBJ)/np2info.o	$(OBJ)/toolwin.o	$(OBJ)/dd2.o		\
-			$(OBJ)/kdispwin.o	$(OBJ)/np2res.o							\
+			$(OBJ)/oemtext.o	$(OBJ)/dosio.o		$(OBJ)/extromio.o	\
+			$(OBJ)/trace.o		$(OBJ)/winloc.o		$(OBJ)/commng.o		\
+			$(OBJ)/cmserial.o	$(OBJ)/cmmidi.o		$(OBJ)/cmpara.o		\
+			$(OBJ)/fontmng.o	$(OBJ)/joymng.o		$(OBJ)/mousemng.o	\
+			$(OBJ)/scrnmng.o	$(OBJ)/soundmng.o	$(OBJ)/sysmng.o		\
+			$(OBJ)/taskmng.o	$(OBJ)/timemng.o	$(OBJ)/juliet.o		\
+			$(OBJ)/sstp.o		$(OBJ)/sstpmsg.o	$(OBJ)/winkbd.o		\
+			$(OBJ)/dclock.o		$(OBJ)/dclockd.o	$(OBJ)/menu.o		\
+			$(OBJ)/ini.o		$(OBJ)/dd2.o		$(OBJ)/toolwin.o	\
+			$(OBJ)/subwind.o	$(OBJ)/mt32snd.o	$(OBJ)/np2res.o		\
+			\
 			$(OBJ)/np2class.o	$(OBJ)/d_about.o	$(OBJ)/d_config.o	\
 			$(OBJ)/d_mpu98.o	$(OBJ)/d_screen.o	$(OBJ)/d_serial.o	\
 			$(OBJ)/d_sound.o	$(OBJ)/d_clnd.o		$(OBJ)/d_disk.o		\
 			$(OBJ)/d_bmp.o		$(OBJ)/dialogs.o						\
+			\
 			$(OBJ)/viewer.o		$(OBJ)/viewcmn.o	$(OBJ)/viewmenu.o	\
 			$(OBJ)/viewmem.o	$(OBJ)/viewreg.o	$(OBJ)/viewseg.o	\
 			$(OBJ)/view1mb.o	$(OBJ)/viewasm.o	$(OBJ)/viewsnd.o	\
-			$(OBJ)/unasm.o												\
+			\
 			$(OBJ)/pccore.o		$(OBJ)/nevent.o		$(OBJ)/calendar.o	\
-			$(OBJ)/timing.o		$(OBJ)/statsave.o	$(OBJ)/debugsub.o
+			$(OBJ)/timing.o		$(OBJ)/keystat.o	$(OBJ)/statsave.o	\
+			$(OBJ)/debugsub.o
 
 
 NP2LIB	= -lddraw -ldxguid -ldsound -lwinmm -lcomctl32 -lwsock32 -mwindows
@@ -197,20 +229,56 @@ $(OBJ)/mimpidef.o	:	$(COMMON)/mimpidef.c
 						$(COMMON)/textfile.h $(COMMON)/mimpidef.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/codecnv.o	:	$(COMMON)/codecnv.c $(HEADERS) $(COMMON)/codecnv.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/parts.o		:	$(COMMON)/parts.c $(HEADERS) $(COMMON)/codecnv.h
+$(OBJ)/parts.o		:	$(COMMON)/parts.c $(HEADERS)
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/parts.oa		:	$(X86ASM)/parts.x86
 	$(AS) $(AOPT) $< -o $@
 
+$(OBJ)/arc.o		:	$(COMMON)/arc.c $(HEADERS) $(TARGET)/dosio.h \
+						$(COMMON)/arc.h $(COMMON)/arcunzip.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/arcunzip.o	:	$(COMMON)/arcunzip.c $(HEADERS) $(TARGET)/dosio.h \
+						$(COMMON)/arc.h $(COMMON)/arcunzip.h $(ZLIBS)
+	$(CC) $(COPT) -o $@ $<
+
+
+
+$(OBJ)/adler32.o	:	$(ZLIB)/adler32.c $(ZLIBS)
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/crc32.o		:	$(ZLIB)/crc32.c $(ZLIBS)
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/inffast.o	:	$(ZLIB)/inffast.c $(ZLIBS)
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/inflate.o	:	$(ZLIB)/inflate.c $(ZLIBS)
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/inftrees.o	:	$(ZLIB)/inftrees.c $(ZLIBS)
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/zutil.o		:	$(ZLIB)/zutil.c $(ZLIBS)
+	$(CC) $(COPT) -o $@ $<
+
+
+
+$(OBJ)/utf8ucs2.o	:	$(CODECNV)/utf8ucs2.c $(HEADERS) $(CODECNV)/textcnv.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/ucs2utf8.o	:	$(CODECNV)/ucs2utf8.c $(HEADERS) $(CODECNV)/textcnv.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/tcswap16.o	:	$(CODECNV)/tcswap16.c $(HEADERS) $(CODECNV)/textcnv.h
+	$(CC) $(COPT) -o $@ $<
+
 
 
 $(OBJ)/i286c.o		:	$(I286C)/i286c.c $(HEADERS) $(CPUCORES) $(PCCORES) \
 						$(IOCORES) $(I286C)/i286c.h $(I286C)/v30patch.h \
-						$(I286C)/dmap.h $(I286C)/i286c.mcr
+						$(I286C)/i286c.mcr $(MEM)/dmax86.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/i286c_mn.o	:	$(I286C)/i286c_mn.c $(HEADERS) $(CPUCORES) \
@@ -250,21 +318,44 @@ $(OBJ)/i286c_rp.o	:	$(I286C)/i286c_rp.c 
 
 $(OBJ)/v30patch.o	:	$(I286C)/v30patch.c $(HEADERS) $(CPUCORES) \
 						$(PCCORES) $(IOCORES) $(I286C)/i286c.h \
-						$(I286C)/v30patch.h $(I286C)/dmap.h \
-						$(I286C)/i286c.mcr $(BIOS)/bios.h
+						$(I286C)/v30patch.h $(I286C)/i286c.mcr \
+						$(MEM)/dmav30.h $(BIOS)/bios.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/memory.o		:	$(I286C)/memory.c $(HEADERS) $(CPUCORES) $(PCCORES) \
-						$(IOCORES) $(I286C)/egcmem.h $(VRAM)/vram.h \
+						$(IOCORES) $(MEM)/memegc.h $(VRAM)/vram.h \
 						$(FONT)/font.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/egcmem.o		:	$(I286C)/egcmem.c $(HEADERS) $(CPUCORES) $(PCCORES) \
-						$(IOCORES) $(I286C)/egcmem.h $(VRAM)/vram.h
+
+
+$(OBJ)/dmax86.o		:	$(MEM)/dmax86.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(MEM)/dmax86.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/dmap.o		:	$(I286C)/dmap.c $(HEADERS) $(CPUCORES) $(PCCORES) \
-						$(IOCORES) $(I286C)/dmap.h
+$(OBJ)/dmav30.o		:	$(MEM)/dmav30.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(MEM)/dmav30.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/memtram.o	:	$(MEM)/memtram.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(MEM)/memtram.h $(VRAM)/vram.h \
+						$(FONT)/font.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/memvram.o	:	$(MEM)/memvram.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(MEM)/memtram.h $(VRAM)/vram.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/memegc.o		:	$(MEM)/memegc.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(MEM)/memegc.h $(VRAM)/vram.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/memems.o		:	$(MEM)/memems.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(MEM)/memems.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/memepp.o		:	$(MEM)/memepp.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(MEM)/memepp.h
 	$(CC) $(COPT) -o $@ $<
 
 
@@ -300,14 +391,14 @@ $(OBJ)/dmac.o		:	$(IO)/dmac.c $(HEADERS)
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/egc.o		:	$(IO)/egc.c $(HEADERS) $(CPUCORES) $(PCCORES) \
-						$(IOCORES) $(I286C)/egcmem.h $(VRAM)/vram.h
+						$(IOCORES) $(MEM)/memegc.h $(VRAM)/vram.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/epsonio.o	:	$(IO)/epsonio.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+$(OBJ)/emsio.o		:	$(IO)/emsio.c $(HEADERS) $(CPUCORES) $(PCCORES) \
 						$(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/emsio.o		:	$(IO)/emsio.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+$(OBJ)/epsonio.o	:	$(IO)/epsonio.c $(HEADERS) $(CPUCORES) $(PCCORES) \
 						$(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
@@ -454,18 +545,10 @@ $(OBJ)/bios.o		:	$(BIOS)/bios.c $(HEADER
 						$(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 \
+						$(BIOS)/startup.res $(BIOS)/biosfd80.res \
 						$(LIO)/lio.h $(FDD)/fddfile.h $(FDD)/fdd_mtr.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios02.o		:	$(BIOS)/bios02.c $(HEADERS) $(CPUCORES) $(PCCORES) \
-						$(IOCORES) $(BIOS)/bios.h
-	$(CC) $(COPT) -o $@ $<
-
-$(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) $(CPUCORES) $(PCCORES) \
 						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h
 	$(CC) $(COPT) -o $@ $<
@@ -508,6 +591,10 @@ $(OBJ)/bios1c.o		:	$(BIOS)/bios1c.c $(HE
 						$(BIOS)/bios.h $(BIOS)/biosmem.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/bios1f.o		:	$(BIOS)/bios1f.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(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 $(BASE)/timing.h
@@ -515,6 +602,88 @@ $(OBJ)/sxsibios.o	:	$(BIOS)/sxsibios.c $
 
 
 
+$(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) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(LIO)/lio.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/gpset.o		:	$(LIO)/gpset.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/gline.o		:	$(LIO)/gline.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/gcircle.o	:	$(LIO)/gcircle.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/gput1.o		:	$(LIO)/gput1.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
+	$(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) \
+						$(TARGET)/scrnmng.h $(VRAM)/scrndraw.h \
+						$(VRAM)/sdraw.h $(VRAM)/dispsync.h $(VRAM)/palettes.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/sdraw.o		:	$(VRAM)/sdraw.c $(HEADERS) $(TARGET)/scrnmng.h \
+						$(VRAM)/scrndraw.h $(VRAM)/sdraw.h \
+						$(VRAM)/palettes.h $(VRAM)/sdraw.mcr
+	$(CC) $(COPT) -o $@ $<
+
+$(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) \
+						$(TARGET)/scrnmng.h $(VRAM)/scrndraw.h \
+						$(VRAM)/palettes.h
+	$(CC) $(COPT) -o $@ $<
+
+$(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) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(VRAM)/vram.h $(VRAM)/scrndraw.h \
+						$(VRAM)/dispsync.h $(VRAM)/palettes.h \
+						$(VRAM)/maketext.h $(VRAM)/maketgrp.h \
+						$(VRAM)/makegrph.h $(VRAM)/makegrph.mcr $(FONT)/font.h
+	$(CC) $(COPT) -o $@ $<
+
+$(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 $@ $<
+
+$(OBJ)/makegrph.oa	:	$(X86ASM)/makegrph.x86 $(X86ASM)/pccore.inc \
+						$(I286CASM)/cpucore.inc $(IOASM)/iocore.inc \
+						$(X86ASM)/vram.inc
+	$(AS) $(AOPT) -i$(X86ASM)/ -i$(I286CASM)/ -i$(IOASM)/ $< -o $@
+
+$(OBJ)/scrnsave.o	:	$(VRAM)/scrnsave.c $(HEADERS) $(PCCORES) $(IOCORES) \
+						$(COMMON)/bmpdata.h $(VRAM)/scrndraw.h \
+						$(VRAM)/dispsync.h $(VRAM)/palettes.h \
+						$(VRAM)/scrnsave.h
+	$(CC) $(COPT) -o $@ $<
+
+
+
 $(OBJ)/sound.o		:	$(SOUND)/sound.c $(HEADERS) $(CPUCORES) $(PCCORES) \
 						$(IOCORES) $(TARGET)/soundmng.h $(SOUND)/sound.h \
 						$(SOUND)/sndcsec.h $(SOUND)/beep.h
@@ -524,11 +693,6 @@ $(OBJ)/sndcsec.o	:	$(SOUND)/sndcsec.c $(
 						$(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 \
 						$(CBUS)/cbuscore.h $(CBUS)/board14.h \
@@ -584,10 +748,6 @@ $(OBJ)/rhythmc.o	:	$(SOUND)/rhythmc.c $(
 						$(SOUND)/sound.h $(SOUND)/rhythm.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/rhythmg.o	:	$(SOUND)/rhythmg.c $(HEADERS) $(SOUND)/sound.h \
-						$(SOUND)/rhythm.h
-	$(CC) $(COPT) -o $@ $<
-
 $(OBJ)/adpcmc.o		:	$(SOUND)/adpcmc.c $(HEADERS) $(SOUND)/sound.h \
 						$(SOUND)/opngen.h $(SOUND)/adpcm.h
 	$(CC) $(COPT) -o $@ $<
@@ -623,25 +783,6 @@ $(OBJ)/s98.o		:	$(SOUND)/s98.c $(HEADERS
 
 
 
-$(OBJ)/midiout.o	:	$(VERMOUTH)/midiout.c $(HEADERS) $(VERMOUTHS)
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/midimod.o	:	$(VERMOUTH)/midimod.c $(HEADERS) $(VERMOUTHS) \
-						$(COMMON)/textfile.h $(TARGET)/dosio.h 
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/midinst.o	:	$(VERMOUTH)/midinst.c $(HEADERS) $(VERMOUTHS) \
-						$(TARGET)/dosio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/midvoice.o	:	$(VERMOUTH)/midvoice.c $(HEADERS) $(VERMOUTHS)
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/midtable.o	:	$(VERMOUTH)/midtable.c $(HEADERS) $(VERMOUTHS)
-	$(CC) $(COPT) -o $@ $<
-
-
-
 $(OBJ)/getsnd.o		:	$(GETSND)/getsnd.c $(HEADERS) $(GETSND)/getsnd.h
 	$(CC) $(COPT) -o $@ $<
 
@@ -660,59 +801,21 @@ $(OBJ)/getsmix.o	:	$(GETSND)/getsmix.c $
 
 
 
-$(OBJ)/vram.o		:	$(VRAM)/vram.c $(HEADERS) $(CPUCORES) $(VRAM)/vram.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/scrndraw.o	:	$(VRAM)/scrndraw.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/scrnmng.h $(VRAM)/scrndraw.h \
-						$(VRAM)/sdraw.h $(VRAM)/dispsync.h $(VRAM)/palettes.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/sdraw.o		:	$(VRAM)/sdraw.c $(HEADERS) $(TARGET)/scrnmng.h \
-						$(VRAM)/scrndraw.h $(VRAM)/sdraw.h \
-						$(VRAM)/palettes.h $(VRAM)/sdraw.mcr
-	$(CC) $(COPT) -o $@ $<
-
-$(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) \
-						$(TARGET)/scrnmng.h $(VRAM)/scrndraw.h \
-						$(VRAM)/palettes.h
+$(OBJ)/midiout.o	:	$(VERMOUTH)/midiout.c $(HEADERS) $(VERMOUTHS)
 	$(CC) $(COPT) -o $@ $<
 
-$(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
+$(OBJ)/midimod.o	:	$(VERMOUTH)/midimod.c $(HEADERS) $(VERMOUTHS) \
+						$(COMMON)/textfile.h $(TARGET)/dosio.h 
 	$(CC) $(COPT) -o $@ $<
 
-$(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 $(VRAM)/makegrph.mcr $(FONT)/font.h
+$(OBJ)/midinst.o	:	$(VERMOUTH)/midinst.c $(HEADERS) $(VERMOUTHS) \
+						$(TARGET)/dosio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(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
+$(OBJ)/midvoice.o	:	$(VERMOUTH)/midvoice.c $(HEADERS) $(VERMOUTHS)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/makegrph.oa	:	$(X86ASM)/makegrph.x86
-	$(AS) $(AOPT) $< -o $@
-
-$(OBJ)/scrnbmp.o	:	$(VRAM)/scrnbmp.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(COMMON)/bmpdata.h $(VRAM)/scrndraw.h \
-						$(VRAM)/dispsync.h $(VRAM)/palettes.h \
-						$(VRAM)/scrnbmp.h
+$(OBJ)/midtable.o	:	$(VERMOUTH)/midtable.c $(HEADERS) $(VERMOUTHS)
 	$(CC) $(COPT) -o $@ $<
 
 
@@ -742,8 +845,7 @@ $(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 $(SOUND)/wavemix.h \
-						$(FDD)/fdd_mtr.h
+						$(TARGET)/soundmng.h $(FDD)/fdd_mtr.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/sxsi.o		:	$(FDD)/sxsi.c $(HEADERS) $(CPUCORES) $(PCCORES) \
@@ -751,39 +853,14 @@ $(OBJ)/sxsi.o		:	$(FDD)/sxsi.c $(HEADERS
 						$(TARGET)/sysmng.h $(FDD)/sxsi.h
 	$(CC) $(COPT) -o $@ $<
 
-
-
-$(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) $(CPUCORES) $(PCCORES) \
-						$(IOCORES) $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gview.o		:	$(LIO)/gview.c $(HEADERS) $(CPUCORES) $(PCCORES) \
-						$(IOCORES) $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gcolor1.o	:	$(LIO)/gcolor1.c $(HEADERS) $(CPUCORES) $(PCCORES) \
-						$(IOCORES) $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gcolor2.o	:	$(LIO)/gcolor2.c $(HEADERS) $(CPUCORES) $(PCCORES) \
-						$(IOCORES) $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gcls.o		:	$(LIO)/gcls.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gpset.o		:	$(LIO)/gpset.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gline.o		:	$(LIO)/gline.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
+$(OBJ)/sxsihdd.o	:	$(FDD)/sxsihdd.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(COMMON)/strres.h $(TARGET)/dosio.h \
+						$(TARGET)/sysmng.h $(FDD)/sxsi.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gput1.o		:	$(LIO)/gput1.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
+$(OBJ)/sxsicd.o		:	$(FDD)/sxsicd.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(COMMON)/strres.h $(TARGET)/dosio.h \
+						$(TARGET)/sysmng.h $(FDD)/sxsi.h
 	$(CC) $(COPT) -o $@ $<
 
 
@@ -840,6 +917,11 @@ $(OBJ)/keydisp.o	:	$(GENERIC)/keydisp.c 
 						$(GENERIC)/keydisp.h $(GENERIC)/keydisp.res
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/softkbd.o	:	$(GENERIC)/softkbd.c $(HEADERS) \
+						$(COMMON)/bmpdata.h $(BASE)/keystat.h \
+						$(GENERIC)/softkbd.h $(GENERIC)/softkbd.res
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/dipswbmp.o	:	$(GENERIC)/dipswbmp.c $(HEADERS) $(COMMON)/bmpdata.h \
 						$(GENERIC)/dipswbmp.h $(GENERIC)/dipswbmp.res
 	$(CC) $(COPT) -o $@ $<
@@ -860,8 +942,17 @@ $(OBJ)/hostdrv.o	:	$(GENERIC)/hostdrv.c 
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/hostdrvs.o	:	$(GENERIC)/hostdrvs.c $(HEADERS) $(PCCORES) \
-						$(COMMON)/codecnv.h $(TARGET)/dosio.h \
-						$(GENERIC)/hostdrv.h $(GENERIC)/hostdrvs.h
+						$(TARGET)/dosio.h $(GENERIC)/hostdrv.h \
+						$(GENERIC)/hostdrvs.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/unasm.o		:	$(GENERIC)/unasm.c $(HEADER) $(GENERIC)/unasm.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/np2info.o	:	$(GENERIC)/np2info.c $(HEADERS) $(CPUCORES) \
+						$(PCCORES) $(IOCORES) $(FMBOARDS) $(COMMON)/strres.h \
+						$(TARGET)/scrnmng.h $(BIOS)/bios.h \
+						$(GENERIC)/np2info.h
 	$(CC) $(COPT) -o $@ $<
 
 
@@ -877,13 +968,13 @@ $(OBJ)/np2.o		:	$(TARGET)/np2.cpp $(HEAD
 						$(TARGET)/winkbd.h $(TARGET)/ini.h $(TARGET)/menu.h \
 						$(TARGET)/winloc.h $(TARGET)/sstp.h \
 						$(TARGET)/sstpmsg.h $(TARGET)/dclock.h \
+						$(TARGET)/subwind.h \
 						$(TARGET)/juliet.h $(DIALOG)/dialog.h \
 						$(I286C)/memory.h $(CBUS)/pc9861k.h \
 						$(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)/debugsub.h \
-						$(GENERIC)/keydisp.h $(DEBUGUTY)/viewer.h
+						$(BASE)/debugsub.h $(DEBUGUTY)/viewer.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/np2arg.o		:	$(TARGET)/np2arg.cpp $(HEADERS) $(TARGET)/np2arg.h \
@@ -893,6 +984,9 @@ $(OBJ)/np2arg.o		:	$(TARGET)/np2arg.cpp 
 $(OBJ)/cputype.oa	:	$(X86ASM)/cputype.x86
 	$(AS) $(AOPT) $< -o $@
 
+$(OBJ)/oemtext.o	:	$(TARGET)/oemtext.cpp $(HEADERS) $(TARGET)/oemtext.h
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/dosio.o		:	$(TARGET)/dosio.cpp $(HEADERS) $(TARGET)/dosio.h
 	$(CC) $(COPT) -o $@ $<
 
@@ -973,7 +1067,7 @@ $(OBJ)/sstp.o		:	$(TARGET)/sstp.cpp $(HE
 
 $(OBJ)/sstpmsg.o	:	$(TARGET)/sstpmsg.cpp $(HEADERS) $(PCCORES) \
 						$(TARGET)/np2.h $(TARGET)/sysmng.h $(TARGET)/sstp.h \
-						$(TARGET)/sstpres.h $(TARGET)/np2info.h
+						$(TARGET)/sstpres.h $(GENERIC)/np2info.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/winkbd.o		:	$(TARGET)/winkbd.cpp $(HEADERS) $(PCCORES) \
@@ -999,11 +1093,7 @@ $(OBJ)/ini.o		:	$(TARGET)/ini.cpp $(HEAD
 						$(TARGET)/ini.h $(TARGET)/winkbd.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/np2info.o	:	$(TARGET)/np2info.cpp $(HEADERS) $(PCCORES) \
-						$(IOCORES) $(FMBOARDS) $(COMMON)/strres.h \
-						$(TARGET)/np2.h $(TARGET)/scrnmng.h \
-						$(TARGET)/np2info.h $(I286C)/cpucore.h \
-						$(I286C)/memory.h $(BIOS)/bios.h
+$(OBJ)/dd2.o		:	$(TARGET)/dd2.cpp $(HEADERS) $(TARGET)/dd2.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/toolwin.o	:	$(TARGET)/toolwin.cpp $(HEADERS) $(PCCORES) \
@@ -1013,17 +1103,18 @@ $(OBJ)/toolwin.o	:	$(TARGET)/toolwin.cpp
 						$(DIALOG)/dialog.h $(FDD)/diskdrv.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/dd2.o		:	$(TARGET)/dd2.cpp $(HEADERS) $(TARGET)/dd2.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/kdispwin.o	:	$(TARGET)/kdispwin.cpp $(HEADERS) \
+$(OBJ)/subwind.o	:	$(TARGET)/subwind.cpp $(HEADERS) \
 						$(TARGET)/resource.h $(TARGET)/np2.h \
 						$(TARGET)/winloc.h $(TARGET)/soundmng.h \
 						$(TARGET)/sysmng.h $(TARGET)/menu.h $(TARGET)/ini.h \
-						$(TARGET)/dd2.h $(TARGET)/kdispwin.h \
+						$(TARGET)/dd2.h $(TARGET)/subwind.h \
 						$(DIALOG)/np2class.h $(GENERIC)/keydisp.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/mt32snd.o	:	$(TARGET)/mt32snd.cpp $(HEADERS) \
+						$(TARGET)/mt32snd.h
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/np2res.o		:	$(TARGET)/np2res.rc $(TARGET)/resource.h
 	$(RC) -i $< -o $@
 
@@ -1034,8 +1125,8 @@ $(OBJ)/np2class.o	:	$(DIALOG)/np2class.c
 
 $(OBJ)/d_about.o	:	$(DIALOG)/d_about.cpp $(HEADERS) $(PCCORES) \
 						$(TARGET)/resource.h $(TARGET)/np2.h \
-						$(TARGET)/np2info.h $(DIALOG)/dialog.h \
-						$(DIALOG)/dialogs.h
+						$(DIALOG)/dialog.h $(DIALOG)/dialogs.h \
+						$(GENERIC)/np2info.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/d_config.o	:	$(DIALOG)/d_config.cpp $(HEADERS) $(PCCORES) \
@@ -1095,7 +1186,7 @@ $(OBJ)/d_bmp.o		:	$(DIALOG)/d_bmp.cpp $(
 						$(COMMON)/strres.h $(TARGET)/resource.h \
 						$(TARGET)/np2.h $(TARGET)/dosio.h \
 						$(TARGET)/sysmng.h $(DIALOG)/dialog.h \
-						$(DIALOG)/dialogs.h $(VRAM)/scrnbmp.h $(FONT)/font.h
+						$(DIALOG)/dialogs.h $(VRAM)/scrnsave.h $(FONT)/font.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/dialogs.o	:	$(DIALOG)/dialogs.cpp $(HEADERS) $(COMMON)/strres.h \
@@ -1167,9 +1258,6 @@ $(OBJ)/viewsnd.o	:	$(DEBUGUTY)/viewsnd.c
 						$(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/unasm.o		:	$(DEBUGUTY)/unasm.cpp $(HEADER) $(DEBUGUTY)/unasm.h
-	$(CC) $(COPT) -o $@ $<
-
 
 
 $(OBJ)/pccore.o		:	$(BASE)/pccore.c $(HEADERS) $(CPUCORES) $(PCCORES) \
@@ -1200,6 +1288,10 @@ $(OBJ)/timing.o		:	$(BASE)/timing.c $(HE
 						$(FDD)/diskdrv.h $(FDD)/fdd_mtr.h $(BASE)/timing.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/keystat.o	:	$(BASE)/keystat.c $(HEADERS) $(PCCORES) $(IOCORES) \
+						$(BASE)/keystat.h
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/statsave.o	:	$(BASE)/statsave.c $(HEADERS) $(CPUCORES) $(PCCORES) \
 						$(IOCORES) $(FMBOARDS) $(COMMON)/strres.h \
 						$(TARGET)/dosio.h $(TARGET)/commng.h \