--- np2/win9xc/Makefile	2003/12/08 06:24:03	1.2
+++ np2/win9xc/Makefile	2004/01/23 17:17:55	1.7
@@ -24,6 +24,7 @@ CBUS		= ../cbus
 BIOS		= ../bios
 SOUND		= ../sound
 VERMOUTH	= ../sound/vermouth
+GETSND		= ../sound/getsnd
 VRAM		= ../vram
 FDD			= ../fdd
 LIO			= ../lio
@@ -36,14 +37,17 @@ HEADERS		=	$(TARGET)/compiler.h $(BASE)/
 				$(COMMON)/_memory.h $(COMMON)/rect.h $(COMMON)/lstarray.h \
 				$(TARGET)/trace.h
 
-PCCORES		=	$(BASE)/pccore.h $(BASE)/nevent.h
+CPUCORES	=	$(I386C)/cpucore.h $(I386C)/memory.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,40 +63,58 @@ COPT	= -c -Wall -pipe -O6 -fomit-frame-p
 			-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$(VRAM) -I$(FDD) -I$(LIO) -I$(FONT) -I$(GENERIC) \
-			-I$(TARGET) -I$(DIALOG)
+			-I$(VERMOUTH) -I$(GETSND) -I$(VRAM) -I$(FDD) -I$(LIO) -I$(FONT) \
+			-I$(GENERIC) -I$(TARGET) -I$(DIALOG)
 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.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)/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)/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					\
+			$(OBJ)/logic_arith.o	$(OBJ)/misc_inst.o					\
+			$(OBJ)/seg_reg.o		$(OBJ)/shift_rotate.o				\
+			$(OBJ)/string_inst.o	$(OBJ)/system_inst.o				\
+			$(OBJ)/fpdummy.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)/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)/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)/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)/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)/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)/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.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)/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	\
@@ -105,7 +127,8 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(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)/cmver.o		$(OBJ)/dipswbmp.o						\
+			$(OBJ)/cmjasts.o	$(OBJ)/cmver.o		$(OBJ)/dipswbmp.o	\
+			$(OBJ)/hostdrv.o	$(OBJ)/hostdrvs.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	\
@@ -116,21 +139,7 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(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)/cpucore.o	$(OBJ)/memory.o		$(OBJ)/egcmem.o		\
-			$(OBJ)/dmap.o												\
-			$(OBJ)/cpu.o		$(OBJ)/cpu_io.o		$(OBJ)/cpu_mem.o	\
-			$(OBJ)/ctrlxfer.o	$(OBJ)/exception.o	$(OBJ)/groups.o		\
-			$(OBJ)/ia32.o		$(OBJ)/inst_table.o	$(OBJ)/interface.o	\
-			$(OBJ)/paging.o		$(OBJ)/resolve.o	$(OBJ)/segments.o	\
-			$(OBJ)/task.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		\
-			$(OBJ)/logic_arith.o	$(OBJ)/misc_inst.o		\
-			$(OBJ)/seg_reg.o		$(OBJ)/shift_rotate.o	\
-			$(OBJ)/string_inst.o	$(OBJ)/system_inst.o	\
-			$(OBJ)/fpdummy.o
+			$(OBJ)/timing.o		$(OBJ)/statsave.o	$(OBJ)/debugsub.o
 
 NP2LIB	= -lddraw -ldxguid -ldsound -lwinmm -lcomctl32 -mwindows
 NP2BIN	= $(BIN)/np2.exe
@@ -193,6 +202,9 @@ $(OBJ)/codecnv.o	:	$(COMMON)/codecnv.c $
 $(OBJ)/parts.o		:	$(COMMON)/parts.c $(HEADERS) $(COMMON)/codecnv.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/parts.oa		:	$(X86ASM)/parts.x86
+	$(AS) $(AOPT) $< -o $@
+
 
 
 $(OBJ)/iocore.o		:	$(IO)/iocore.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -229,6 +241,9 @@ $(OBJ)/egc.o		:	$(IO)/egc.c $(HEADERS) $
 						$(I386C)/memory.h $(I386C)/egcmem.h $(VRAM)/vram.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/epsonio.o	:	$(IO)/epsonio.c $(HEADERS) $(PCCORES) $(IOCORES)
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/extmem.o		:	$(IO)/extmem.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(I386C)/cpucore.h $(I386C)/memory.h
 	$(CC) $(COPT) -o $@ $<
@@ -254,13 +269,13 @@ $(OBJ)/gdc_pset.o	:	$(IO)/gdc_pset.c $(H
 						$(I386C)/memory.h $(IO)/gdc_pset.h $(VRAM)/vram.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/itf.o		:	$(IO)/itf.c $(HEADERS) $(PCCORES) $(IOCORES)
-	$(CC) $(COPT) -o $@ $<
-
 $(OBJ)/mouseif.o	:	$(IO)/mouseif.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(TARGET)/mousemng.h $(I386C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/necio.o		:	$(IO)/necio.c $(HEADERS) $(PCCORES) $(IOCORES)
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/nmiio.o		:	$(IO)/nmiio.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(I386C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
@@ -300,6 +315,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) $(TARGET)/dosio.h \
+						$(PCCORES) $(IOCORES) $(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 \
+						$(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 \
+						$(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
@@ -419,6 +451,11 @@ $(OBJ)/bios1c.o		:	$(BIOS)/bios1c.c $(HE
 						$(BIOS)/bios.h $(BIOS)/biosmem.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
+	$(CC) $(COPT) -o $@ $<
+
 
 
 $(OBJ)/sound.o		:	$(SOUND)/sound.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -430,6 +467,11 @@ $(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 \
 						$(I386C)/cpucore.h $(CBUS)/cbuscore.h \
@@ -468,6 +510,9 @@ $(OBJ)/opngeng.o	:	$(SOUND)/opngeng.c $(
 						$(FMBOARDS) $(SOUND)/sound.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/opngeng.oa	:	$(X86ASM)/opngeng.x86
+	$(AS) $(AOPT) $< -o $@
+
 $(OBJ)/psggenc.o	:	$(SOUND)/psggenc.c $(HEADERS) $(SOUND)/sound.h \
 						$(SOUND)/psggen.h $(GENERIC)/keydisp.h
 	$(CC) $(COPT) -o $@ $<
@@ -538,6 +583,24 @@ $(OBJ)/midtable.o	:	$(VERMOUTH)/midtable
 
 
 
+$(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) $(I386C)/memory.h \
 						$(VRAM)/vram.h
 	$(CC) $(COPT) -o $@ $<
@@ -580,6 +643,9 @@ $(OBJ)/makegrph.o	:	$(VRAM)/makegrph.c $
 						$(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 \
@@ -703,13 +769,38 @@ $(OBJ)/fontmake.o	:	$(FONT)/fontmake.c $
 
 
 
+$(OBJ)/cmndraw.o	:	$(GENERIC)/cmndraw.c $(HEADERS) \
+						$(TARGET)/scrnmng.h $(GENERIC)/cmndraw.h
+	$(CC) $(COPT) -o $@ $<
+
+$(OBJ)/keydisp.o	:	$(GENERIC)/keydisp.c $(HEADERS) $(PCCORES) \
+						$(IOCORES) $(FMBOARDS) $(SOUND)/sound.h \
+						$(GENERIC)/cmndraw.h $(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)/cmjasts.o	:	$(GENERIC)/cmjasts.c $(HEADERS) $(CPUCORES) \
+						$(TARGET)/commng.h $(SOUND)/sound.h \
+						$(GENERIC)/cmjasts.h
+	$(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)/dipswbmp.o	:	$(GENERIC)/dipswbmp.c $(HEADERS) $(COMMON)/bmpdata.h \
-						$(GENERIC)/dipswbmp.h $(GENERIC)/dipswbmp.res
+$(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 \
+						$(GENERIC)/hostdrvs.h
 	$(CC) $(COPT) -o $@ $<
 
 
@@ -717,8 +808,7 @@ $(OBJ)/dipswbmp.o	:	$(GENERIC)/dipswbmp.
 $(OBJ)/np2.o		:	$(TARGET)/np2.cpp $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(COMMON)/strres.h $(COMMON)/parts.h \
 						$(TARGET)/resource.h $(TARGET)/np2.h \
-						$(TARGET)/np2arg.h \
-						$(TARGET)/dosio.h \
+						$(TARGET)/np2arg.h $(TARGET)/dosio.h \
 						$(TARGET)/commng.h $(TARGET)/joymng.h \
 						$(TARGET)/mousemng.h $(TARGET)/scrnmng.h \
 						$(TARGET)/soundmng.h $(TARGET)/sysmng.h \
@@ -744,7 +834,7 @@ $(OBJ)/trace.o		:	$(TARGET)/trace.cpp $(
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/commng.o		:	$(TARGET)/commng.cpp $(HEADERS) $(TARGET)/np2.h \
-						$(TARGET)/commng.h 
+						$(TARGET)/commng.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/fontmng.o	:	$(TARGET)/fontmng.cpp $(HEADERS) $(TARGET)/fontmng.h
@@ -902,8 +992,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) \
@@ -965,6 +1054,13 @@ $(OBJ)/segments.o	:	$(IA32)/segments.c
 $(OBJ)/task.o		:	$(IA32)/task.c
 	$(CC) $(COPT) -o $@ $<
 
+$(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
 	$(CC) $(COPT) -o $@ $<