--- np2/win9x/Makefile	2004/03/19 03:36:53	1.23
+++ np2/win9x/Makefile	2004/06/21 15:19:15	1.26
@@ -105,18 +105,18 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(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.oa	$(OBJ)/scrnbmp.o	\
+			$(OBJ)/maketgrp.o	$(OBJ)/makegrph.oa	$(OBJ)/scrnsave.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)/gpset.o		\
-			$(OBJ)/gline.o		$(OBJ)/gput1.o							\
+			$(OBJ)/gline.o		$(OBJ)/gcircle.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)/cmndraw.o	$(OBJ)/keydisp.o	$(OBJ)/dipswbmp.o	\
-			$(OBJ)/cmjasts.o	$(OBJ)/hostdrv.o	$(OBJ)/hostdrvs.o	\
-			$(OBJ)/unasm.o		$(OBJ)/np2info.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	\
@@ -126,7 +126,7 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(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)/toolwin.o	$(OBJ)/dd2.o		$(OBJ)/kdispwin.o	\
+			$(OBJ)/dd2.o		$(OBJ)/toolwin.o	$(OBJ)/subwind.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	\
@@ -694,10 +694,10 @@ $(OBJ)/makegrph.o	:	$(VRAM)/makegrph.c $
 $(OBJ)/makegrph.oa	:	$(X86ASM)/makegrph.x86
 	$(AS) $(AOPT) $< -o $@
 
-$(OBJ)/scrnbmp.o	:	$(VRAM)/scrnbmp.c $(HEADERS) $(PCCORES) $(IOCORES) \
+$(OBJ)/scrnsave.o	:	$(VRAM)/scrnsave.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(COMMON)/bmpdata.h $(VRAM)/scrndraw.h \
 						$(VRAM)/dispsync.h $(VRAM)/palettes.h \
-						$(VRAM)/scrnbmp.h
+						$(VRAM)/scrnsave.h
 	$(CC) $(COPT) -o $@ $<
 
 
@@ -752,6 +752,9 @@ $(OBJ)/gpset.o		:	$(LIO)/gpset.c $(HEADE
 $(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 $@ $<
 
@@ -809,6 +812,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 $@ $<
@@ -855,13 +863,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 \
@@ -977,6 +985,9 @@ $(OBJ)/ini.o		:	$(TARGET)/ini.cpp $(HEAD
 						$(TARGET)/ini.h $(TARGET)/winkbd.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/dd2.o		:	$(TARGET)/dd2.cpp $(HEADERS) $(TARGET)/dd2.h
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/toolwin.o	:	$(TARGET)/toolwin.cpp $(HEADERS) $(PCCORES) \
 						$(COMMON)/strres.h $(TARGET)/resource.h \
 						$(TARGET)/np2.h $(TARGET)/dosio.h $(TARGET)/sysmng.h \
@@ -984,14 +995,11 @@ $(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 $@ $<
 
@@ -1066,7 +1074,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 \