--- np2/win9xc/Makefile	2004/01/23 15:05:06	1.6
+++ np2/win9xc/Makefile	2005/02/12 12:13:59	1.16
@@ -1,5 +1,5 @@
 # makefile for cygwin
-#   gcc version 3.2 20020927 (prerelease)
+#   gcc version 3.3.3
 
 
 AS		= nasmw
@@ -19,6 +19,7 @@ I386C		= ../i386c
 IA32		= ../i386c/ia32
 IA32INST	= ../i386c/ia32/instructions
 IA32FPU		= ../i386c/ia32/instructions/fpu
+MEM			= ../mem
 IO			= ../io
 CBUS		= ../cbus
 BIOS		= ../bios
@@ -43,7 +44,7 @@ PCCORES		=	$(BASE)/pccore.h $(BASE)/neve
 
 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)/epsonio.h $(IO)/extmem.h $(IO)/fdc.h $(IO)/fdd320.h \
+				$(IO)/epsonio.h $(IO)/emsio.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 \
@@ -62,9 +63,9 @@ COPT	= -c -Wall -pipe -O6 -fomit-frame-p
 			-fsigned-char -mno-cygwin -march=pentium \
 			-DWIN32 -DNDEBUG -D_WINDOWS -DCPUCORE_IA32 -DTRACE \
 			-I$(BASE) -I$(COMMON) -I$(I386C) -I$(IA32) -I$(IA32INST) \
-			-I$(IA32FPU) -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$(IA32FPU) -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)
 LOPT	= -mno-cygwin -lstdc++
 
 NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.o		$(OBJ)/_memory.o	\
@@ -73,11 +74,10 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(OBJ)/parts.o												\
 			$(OBJ)/cpu.o		$(OBJ)/cpu_io.o		$(OBJ)/cpu_mem.o	\
 			$(OBJ)/ctrlxfer.o	$(OBJ)/exception.o	$(OBJ)/groups.o		\
-			$(OBJ)/cpucore.o	$(OBJ)/memory.o		$(OBJ)/egcmem.o		\
-			$(OBJ)/dmap.o												\
+			$(OBJ)/cpucore.o	$(OBJ)/memory.o							\
 			$(OBJ)/ia32.o		$(OBJ)/inst_table.o	$(OBJ)/interface.o	\
 			$(OBJ)/paging.o		$(OBJ)/resolve.o	$(OBJ)/segments.o	\
-			$(OBJ)/task.o		$(OBJ)/iadebug.o						\
+			$(OBJ)/task.o		$(OBJ)/iadebug.o	$(OBJ)/iadisasm.o	\
 			$(OBJ)/bin_arith.o		$(OBJ)/bit_byte.o					\
 			$(OBJ)/ctrl_trans.o		$(OBJ)/data_trans.o					\
 			$(OBJ)/dec_arith.o		$(OBJ)/flag_ctrl.o					\
@@ -85,15 +85,18 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(OBJ)/seg_reg.o		$(OBJ)/shift_rotate.o				\
 			$(OBJ)/string_inst.o	$(OBJ)/system_inst.o				\
 			$(OBJ)/fpdummy.o											\
+			$(OBJ)/dmax86.o		$(OBJ)/dmav30.o		$(OBJ)/memtram.o	\
+			$(OBJ)/memvram.o	$(OBJ)/memegc.o		$(OBJ)/memvga.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)/extmem.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)/np2sysp.o	$(OBJ)/pcidev.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	\
@@ -102,44 +105,44 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(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.o	$(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.o	$(OBJ)/scrnbmp.o	\
+			$(OBJ)/maketgrp.o	$(OBJ)/makegrph.o	$(OBJ)/makegrex.o	\
+			$(OBJ)/scrnbmp.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.o	$(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)/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)/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)/cmjasts.o	$(OBJ)/cmver.o		$(OBJ)/dipswbmp.o	\
-			$(OBJ)/hostdrv.o	$(OBJ)/hostdrvs.o						\
+			$(OBJ)/hostdrv.o	$(OBJ)/hostdrvs.o	$(OBJ)/np2info.o	\
+			$(OBJ)/softkbd.o	$(OBJ)/cmndraw.o						\
 			$(OBJ)/np2.o		$(OBJ)/np2arg.o		$(OBJ)/dosio.o		\
 			$(OBJ)/trace.o		$(OBJ)/commng.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)/winkbd.o		$(OBJ)/menu.o		\
-			$(OBJ)/ini.o		$(OBJ)/np2res.o							\
+			$(OBJ)/ini.o		$(OBJ)/np2res.o		$(OBJ)/subwind.o	\
 			$(OBJ)/d_about.o	$(OBJ)/d_config.o	$(OBJ)/d_mpu98.o	\
 			$(OBJ)/d_screen.o	$(OBJ)/d_sound.o	$(OBJ)/d_clnd.o		\
 			$(OBJ)/d_disk.o		$(OBJ)/d_bmp.o		$(OBJ)/dialogs.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 -mwindows
 NP2BIN	= $(BIN)/np2.exe
@@ -196,40 +199,71 @@ $(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)/dmax86.o		:	$(MEM)/dmax86.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(MEM)/dmax86.h
+	$(CC) $(COPT) -o $@ $<
+
+$(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)/memvga.o		:	$(MEM)/memvga.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(MEM)/memvga.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 $@ $<
+
+
 
-$(OBJ)/iocore.o		:	$(IO)/iocore.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I386C)/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) \
-						$(I386C)/cpucore.h
+$(OBJ)/artic.o		:	$(IO)/artic.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/cgrom.o		:	$(IO)/cgrom.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/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) $(I386C)/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) \
-						$(I386C)/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 $(I386C)/cpucore.h \
+$(OBJ)/dipsw.o		:	$(IO)/dipsw.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(TARGET)/sysmng.h \
 						$(SOUND)/sound.h $(SOUND)/beep.h
 	$(CC) $(COPT) -o $@ $<
 
@@ -237,15 +271,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) \
-						$(I386C)/memory.h $(I386C)/egcmem.h $(VRAM)/vram.h
+$(OBJ)/egc.o		:	$(IO)/egc.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(MEM)/memegc.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) \
-						$(I386C)/cpucore.h $(I386C)/memory.h
+$(OBJ)/emsio.o		:	$(IO)/emsio.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/fdc.o		:	$(IO)/fdc.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -255,46 +290,48 @@ $(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 $(I386C)/cpucore.h \
-						$(I386C)/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) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(IO)/gdc_pset.h $(VRAM)/vram.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/gdc_sub.o	:	$(IO)/gdc_sub.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/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)/gdc_pset.o	:	$(IO)/gdc_pset.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/memory.h $(IO)/gdc_pset.h $(VRAM)/vram.h
+$(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 $(I386C)/cpucore.h
+$(OBJ)/necio.o		:	$(IO)/necio.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/necio.o		:	$(IO)/necio.c $(HEADERS) $(PCCORES) $(IOCORES)
+$(OBJ)/nmiio.o		:	$(IO)/nmiio.c $(HEADERS) $(PCCORES) $(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/nmiio.o		:	$(IO)/nmiio.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h
+$(OBJ)/np2sysp.o	:	$(IO)/np2sysp.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(COMMON)/strres.h $(TARGET)/taskmng.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/np2sysp.o	:	$(IO)/np2sysp.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(COMMON)/strres.h $(TARGET)/taskmng.h \
-						$(I386C)/cpucore.h
+$(OBJ)/pcidev.o		:	$(IO)/pcidev.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/pic.o		:	$(IO)/pic.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h
+$(OBJ)/pic.o		:	$(IO)/pic.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES)
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/pit.o		:	$(IO)/pit.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/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) \
-						$(I386C)/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) \
@@ -315,19 +352,19 @@ $(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) $(TARGET)/dosio.h \
-						$(PCCORES) $(IOCORES) $(CBUS)/cbuscore.h \
+$(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) $(TARGET)/dosio.h \
-						$(PCCORES) $(IOCORES) $(CBUS)/cbuscore.h \
+$(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) $(TARGET)/dosio.h \
-						$(PCCORES) $(IOCORES) $(CBUS)/cbuscore.h \
+$(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 $@ $<
@@ -377,117 +414,189 @@ $(OBJ)/amd98.o		:	$(CBUS)/amd98.c $(HEAD
 						$(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/pcm86io.o	:	$(CBUS)/pcm86io.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I386C)/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 $(I386C)/cpucore.h \
-						$(I386C)/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)/biosfd80.res \
+						$(LIO)/lio.h $(FDD)/fddfile.h $(FDD)/fdd_mtr.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios02.o		:	$(BIOS)/bios02.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(BIOS)/bios.h 
+$(OBJ)/bios09.o		:	$(BIOS)/bios09.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios08.o		:	$(BIOS)/bios08.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h
+$(OBJ)/bios0c.o		:	$(BIOS)/bios0c.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h \
+						$(BIOS)/rsbios.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios09.o		:	$(BIOS)/bios09.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/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)/bios0c.o		:	$(BIOS)/bios0c.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h $(BIOS)/rsbios.h
+$(OBJ)/bios13.o		:	$(BIOS)/bios13.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios12.o		:	$(BIOS)/bios12.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h
+$(OBJ)/bios18.o		:	$(BIOS)/bios18.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h \
+						$(FONT)/font.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios13.o		:	$(BIOS)/bios13.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h
+$(OBJ)/bios19.o		:	$(BIOS)/bios19.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h $(BIOS)/biosmem.h \
+						$(BIOS)/rsbios.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios18.o		:	$(BIOS)/bios18.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h $(FONT)/font.h
+$(OBJ)/bios1a.o		:	$(BIOS)/bios1a.c $(HEADERS) $(CPUCORE) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios19.o		:	$(BIOS)/bios19.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h $(BIOS)/rsbios.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
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios1a.o		:	$(BIOS)/bios1a.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(BIOS)/bios.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)/bios1b.o		:	$(BIOS)/bios1b.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h $(FDD)/fddfile.h $(FDD)/fdd_mtr.h \
-						$(FDD)/sxsi.h
+$(OBJ)/bios1f.o		:	$(BIOS)/bios1f.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(BIOS)/bios.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/bios1c.o		:	$(BIOS)/bios1c.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/timemng.h $(I386C)/cpucore.h \
-						$(I386C)/memory.h $(BASE)/calendar.h \
-						$(BIOS)/bios.h $(BIOS)/biosmem.h 
+$(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
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/sxsibios.o	:	$(BIOS)/sxsibios.c $(HEADERS) $(PCCORES) \
-						$(BIOS)/bios.h $(BIOS)/biosmem.h $(BIOS)/sxsibios.h \
-						$(CBUS)/scsicmd.h $(FDD)/sxsi.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) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(LIO)/lio.h
+	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/gpset.o		:	$(LIO)/gpset.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
+	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/sound.o		:	$(SOUND)/sound.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/soundmng.h $(I386C)/cpucore.h \
-						$(SOUND)/sound.h $(SOUND)/sndcsec.h $(SOUND)/beep.h
+$(OBJ)/gline.o		:	$(LIO)/gline.c $(HEADERS) $(CPUCORES) $(LIO)/lio.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/sndcsec.o	:	$(SOUND)/sndcsec.c $(HEADERS) $(SOUND)/sound.h \
-						$(SOUND)/sndcsec.h
+$(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
+	$(AS) $(AOPT) $< -o $@
+
+$(OBJ)/makegrex.o	:	$(VRAM)/makegrex.c $(HEADERS) $(CPUCORES) $(PCCORES) \
+						$(IOCORES) $(VRAM)/vram.h $(VRAM)/scrndraw.h \
+						$(VRAM)/dispsync.h $(VRAM)/makegrex.h
+	$(CC) $(COPT) -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
+	$(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
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/wavemix.o	:	$(SOUND)/wavemix.c $(HEADERS) $(PCCORES) \
-						$(SOUND)/sound.h $(GETSND)/getsnd.h \
-						$(SOUND)/wavemix.res
+$(OBJ)/sndcsec.o	:	$(SOUND)/sndcsec.c $(HEADERS) $(SOUND)/sound.h \
+						$(SOUND)/sndcsec.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/fmboard.o	:	$(SOUND)/fmboard.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(FMBOARDS) $(TARGET)/joymng.h $(TARGET)/soundmng.h \
-						$(I386C)/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 \
@@ -521,12 +630,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
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/rhythmg.o	:	$(SOUND)/rhythmg.c $(HEADERS) $(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)/adpcmc.o		:	$(SOUND)/adpcmc.c $(HEADERS) $(SOUND)/sound.h \
@@ -537,8 +643,8 @@ $(OBJ)/adpcmg.o		:	$(SOUND)/adpcmg.c $(H
 						$(SOUND)/adpcm.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/pcm86c.o		:	$(SOUND)/pcm86c.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I386C)/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) \
@@ -549,12 +655,12 @@ $(OBJ)/cs4231c.o	:	$(SOUND)/cs4231c.c $(
 						$(FMBOARDS) $(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/cs4231g.o	:	$(SOUND)/cs4231g.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(FMBOARDS) $(I386C)/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 \
-						$(I386C)/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) \
@@ -601,66 +707,14 @@ $(OBJ)/getsmix.o	:	$(GETSND)/getsmix.c $
 
 
 
-$(OBJ)/vram.o		:	$(VRAM)/vram.c $(HEADERS) $(I386C)/memory.h \
-						$(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)/dispsync.o	:	$(VRAM)/dispsync.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/scrnmng.h $(I386C)/memory.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) $(PCCORES) $(IOCORES) \
-						$(I386C)/memory.h $(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) \
-						$(I386C)/memory.h $(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
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/makegrph.o	:	$(VRAM)/makegrph.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/memory.h $(VRAM)/vram.h $(VRAM)/scrndraw.h \
-						$(VRAM)/dispsync.h $(VRAM)/makegrph.h \
-						$(VRAM)/makegrph.mcr
-	$(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
-	$(CC) $(COPT) -o $@ $<
-
-
-
 $(OBJ)/diskdrv.o	:	$(FDD)/diskdrv.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(TARGET)/dosio.h $(TARGET)/sysmng.h \
 						$(FDD)/diskdrv.h $(FDD)/fddfile.h
 	$(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) \
@@ -681,84 +735,46 @@ $(OBJ)/fdd_mtr.o	:	$(FDD)/fdd_mtr.c $(HE
 						$(TARGET)/soundmng.h $(FDD)/fdd_mtr.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/sxsi.o		:	$(FDD)/sxsi.c $(HEADERS) $(PCCORES) \
-						$(TARGET)/sysmng.h $(I386C)/cpucore.h $(FDD)/sxsi.h
-	$(CC) $(COPT) -o $@ $<
-
-
-
-$(OBJ)/lio.o		:	$(LIO)/lio.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(BIOS)/bios.h \
-						$(BIOS)/biosmem.h $(VRAM)/vram.h $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gscreen.o	:	$(LIO)/gscreen.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gview.o		:	$(LIO)/gview.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gcolor1.o	:	$(LIO)/gcolor1.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gcolor2.o	:	$(LIO)/gcolor2.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I386C)/cpucore.h $(I386C)/memory.h $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gcls.o		:	$(LIO)/gcls.c $(HEADERS) $(I386C)/cpucore.h \
-						$(I386C)/memory.h $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gpset.o		:	$(LIO)/gpset.c $(HEADERS) $(I386C)/cpucore.h \
-						$(I386C)/memory.h $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gline.o		:	$(LIO)/gline.c $(HEADERS) $(I386C)/cpucore.h \
-						$(I386C)/memory.h $(LIO)/lio.h
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/gput1.o		:	$(LIO)/gput1.c $(HEADERS) $(I386C)/cpucore.h \
-						$(I386C)/memory.h $(LIO)/lio.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)/font.o		:	$(FONT)/font.c $(HEADERS) $(COMMON)/strres.h \
-						$(TARGET)/dosio.h $(I386C)/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) $(I386C)/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 \
-						$(I386C)/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 $(I386C)/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 \
-						$(I386C)/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 \
-						$(I386C)/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 $(I386C)/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 \
-						$(I386C)/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 \
@@ -775,17 +791,16 @@ $(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
+$(OBJ)/softkbd.o	:	$(GENERIC)/softkbd.c $(HEADERS) \
+						$(COMMON)/bmpdata.h $(BASE)/keystat.h \
+						$(GENERIC)/softkbd.h $(GENERIC)/softkbd.res
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/cmjasts.o	:	$(GENERIC)/cmjasts.c $(HEADERS) $(CPUCORES) \
-						$(TARGET)/commng.h $(SOUND)/sound.h \
-						$(GENERIC)/cmjasts.h
+$(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 \
@@ -793,16 +808,30 @@ $(OBJ)/cmver.o		:	$(GENERIC)/cmver.c $(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) $(CPUCORES) \
-						$(PCCORES) $(IOCORES) $(GENERIC)/hostdrv.h \
+$(OBJ)/hostdrvs.o	:	$(GENERIC)/hostdrvs.c $(HEADERS) $(PCCORES) \
+						$(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 $@ $<
+
 
 
 $(OBJ)/np2.o		:	$(TARGET)/np2.cpp $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -886,6 +915,14 @@ $(OBJ)/ini.o		:	$(TARGET)/ini.cpp $(HEAD
 						$(TARGET)/ini.h $(TARGET)/winkbd.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/subwind.o	:	$(TARGET)/subwind.cpp $(HEADERS) \
+						$(TARGET)/resource.h $(TARGET)/np2.h \
+						$(TARGET)/soundmng.h $(TARGET)/sysmng.h \
+						$(TARGET)/menu.h $(TARGET)/ini.h \
+						$(TARGET)/subwind.h \
+						$(GENERIC)/keydisp.h
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/np2res.o		:	$(TARGET)/np2res.rc $(TARGET)/resource.h
 	$(RC) -i $< -o $@
 
@@ -955,22 +992,23 @@ $(OBJ)/dialogs.o	:	$(DIALOG)/dialogs.cpp
 
 
 
-$(OBJ)/pccore.o		:	$(BASE)/pccore.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(TARGET)/soundmng.h $(TARGET)/sysmng.h \
-						$(TARGET)/timemng.h $(I386C)/cpucore.h \
-						$(I386C)/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) \
-						$(I386C)/cpucore.h
+$(OBJ)/nevent.o		:	$(BASE)/nevent.c $(HEADERS) $(CPUCORES) $(PCCORES)
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/calendar.o	:	$(BASE)/calendar.c $(HEADERS) $(PCCORES) \
@@ -982,37 +1020,38 @@ $(OBJ)/timing.o		:	$(BASE)/timing.c $(HE
 						$(FDD)/diskdrv.h $(FDD)/fdd_mtr.h $(BASE)/timing.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/statsave.o	:	$(BASE)/statsave.c $(HEADERS) $(PCCORES) $(IOCORES) \
+$(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 \
 						$(TARGET)/scrnmng.h $(TARGET)/soundmng.h \
-						$(TARGET)/timemng.h $(I386C)/cpucore.h \
-						$(I386C)/memory.h $(CBUS)/cbuscore.h \
-						$(CBUS)/pc9861k.h $(CBUS)/mpu98ii.h \
-						$(CBUS)/board14.h $(BIOS)/bios.h $(VRAM)/vram.h \
-						$(VRAM)/palettes.h $(VRAM)/maketext.h \
-						$(SOUND)/sound.h $(SOUND)/fmboard.h $(SOUND)/beep.h \
+						$(TARGET)/timemng.h $(CBUS)/cbuscore.h \
+						$(CBUS)/sasiio.h $(CBUS)/scsiio.h $(CBUS)/pc9861k.h \
+						$(CBUS)/mpu98ii.h $(CBUS)/board14.h $(CBUS)/amd98.h \
+						$(BIOS)/bios.h $(VRAM)/vram.h $(VRAM)/palettes.h \
+						$(VRAM)/maketext.h $(SOUND)/sound.h $(SOUND)/beep.h \
 						$(FONT)/font.h $(FDD)/fddfile.h $(FDD)/fdd_mtr.h \
-						$(FDD)/sxsi.h $(BASE)/calendar.h $(GENERIC)/keydisp.h
+						$(FDD)/sxsi.h $(GENERIC)/keydisp.h \
+						$(GENERIC)/hostdrv.h $(BASE)/calendar.h \
+						$(BASE)/statsave.tbl
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/debugsub.o	:	$(BASE)/debugsub.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(COMMON)/strres.h $(TARGET)/dosio.h \
-						$(I386C)/cpucore.h $(I386C)/memory.h \
-						$(BASE)/debugsub.h
+$(OBJ)/debugsub.o	:	$(BASE)/debugsub386.c $(HEADERS) $(CPUCORES) \
+						$(PCCORES) $(IOCORES) $(COMMON)/strres.h \
+						$(TARGET)/dosio.h $(BASE)/debugsub.h
 	$(CC) $(COPT) -o $@ $<
 
 
+
 $(OBJ)/cpucore.o	:	$(I386C)/cpucore.c
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/memory.o		:	$(I386C)/memory.c
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/egcmem.o		:	$(I386C)/egcmem.c
-	$(CC) $(COPT) -o $@ $<
-
-$(OBJ)/dmap.o		:	$(I386C)/dmap.c
-	$(CC) $(COPT) -o $@ $<
 
 
 $(OBJ)/cpu.o		:	$(IA32)/cpu.c
@@ -1057,6 +1096,9 @@ $(OBJ)/task.o		:	$(IA32)/task.c
 $(OBJ)/iadebug.o	:	$(IA32)/debug.c
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/iadisasm.o	:	$(IA32)/disasm.c
+	$(CC) $(COPT) -o $@ $<
+
 
 
 $(OBJ)/bin_arith.o		:	$(IA32INST)/bin_arith.c