--- np2/win9x/Makefile	2003/12/08 00:55:34	1.11
+++ np2/win9x/Makefile	2004/01/22 01:10:05	1.15
@@ -21,6 +21,7 @@ CBUS		= ../cbus
 BIOS		= ../bios
 SOUND		= ../sound
 VERMOUTH	= ../sound/vermouth
+GETSND		= ../sound/getsnd
 VRAM		= ../vram
 FDD			= ../fdd
 LIO			= ../lio
@@ -35,14 +36,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	=	$(I286C)/cpucore.h $(I286C)/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 \
@@ -57,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	\
@@ -72,12 +77,13 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(OBJ)/dmap.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)/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)/pc9861k.o	$(OBJ)/mpu98ii.o	\
 			$(OBJ)/board14.o	$(OBJ)/board26k.o	$(OBJ)/board86.o	\
 			$(OBJ)/boardx2.o	$(OBJ)/board118.o	$(OBJ)/boardspb.o	\
@@ -109,6 +115,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)/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	\
@@ -294,6 +301,9 @@ $(OBJ)/egc.o		:	$(IO)/egc.c $(HEADERS) $
 						$(I286C)/memory.h $(I286C)/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) \
 						$(I286C)/cpucore.h $(I286C)/memory.h
 	$(CC) $(COPT) -o $@ $<
@@ -319,13 +329,13 @@ $(OBJ)/gdc_pset.o	:	$(IO)/gdc_pset.c $(H
 						$(I286C)/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 $(I286C)/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) \
 						$(I286C)/cpucore.h
 	$(CC) $(COPT) -o $@ $<
@@ -788,6 +798,11 @@ $(OBJ)/dipswbmp.o	:	$(GENERIC)/dipswbmp.
 						$(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)/np2.o		:	$(TARGET)/np2.cpp $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -806,7 +821,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 $@ $<
 
@@ -1133,8 +1148,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) \