--- np2/sdl/makefile.win	2004/01/25 06:01:31	1.9
+++ np2/sdl/makefile.win	2004/02/19 03:04:02	1.12
@@ -123,7 +123,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)/cmjasts.o	$(OBJ)/cmver.o							\
+			$(OBJ)/cmjasts.o	$(OBJ)/cmver.o		$(OBJ)/hostdrv.o	\
+			$(OBJ)/hostdrvs.o											\
 			$(OBJ)/vramhdl.o	$(OBJ)/vrammix.o						\
 			$(OBJ)/menustr.o	$(OBJ)/filesel.o	$(OBJ)/dlgcfg.o		\
 			$(OBJ)/dlgscr.o		$(OBJ)/dlgabout.o						\
@@ -137,7 +138,8 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(OBJ)/timemng.o	$(OBJ)/sdlkbd.o		$(OBJ)/ini.o		\
 			$(OBJ)/sysmenu.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											\
 			$(OBJ)/SDL.o		$(OBJ)/SDLmpw.o		$(OBJ)/SDLevent.o	\
 			$(OBJ)/SDLvideo.o	$(OBJ)/SDLaudio.o	$(OBJ)/SDL_ttf.o
 
@@ -524,11 +526,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 \
@@ -864,6 +861,15 @@ $(OBJ)/hostdrvs.o	:	$(GENERIC)/hostdrvs.
 						$(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)/vramhdl.o	:	$(EMBED)/vramhdl.c $(HEADERS) $(EMBEDS) \
@@ -1037,6 +1043,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 \