--- np2/win9x/Makefile	2003/10/21 11:22:05	1.1
+++ np2/win9x/Makefile	2003/10/28 18:21:05	1.7
@@ -26,6 +26,7 @@ FDD			= ../fdd
 LIO			= ../lio
 FONT		= ../font
 TARGET		= .
+X86ASM		= ./x86
 DIALOG		= ./dialog
 KEYDISP		= ./keydisp
 DEBUGUTY	= ./debuguty
@@ -52,21 +53,23 @@ VERMOUTHS	=	$(VERMOUTH)/midiout.h $(VERM
 				$(VERMOUTH)/midtable.h
 
 AOPT	= -f win32
-COPT	= -c -Wall -pipe -O2 -fomit-frame-pointer -mno-cygwin \
-			-march=pentium -DWIN32 -DNDEBUG -D_WINDOWS \
+COPT	= -c -Wall -pipe -O6 -fomit-frame-pointer -fkeep-inline-functions \
+			-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$(TARGET) -I$(DIALOG) -I$(KEYDISP) -I$(DEBUGUTY)
+			-I$(TARGET) -I$(DIALOG) -I$(KEYDISP) -I$(DEBUGUTY) -I$(X86ASM)
 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)/parts.oa												\
 			$(OBJ)/i286c.o		$(OBJ)/i286c_mn.o	$(OBJ)/i286c_ea.o	\
 			$(OBJ)/i286c_0f.o	$(OBJ)/i286c_8x.o	$(OBJ)/i286c_sf.o	\
 			$(OBJ)/i286c_f6.o	$(OBJ)/i286c_fe.o	$(OBJ)/i286c_rp.o	\
-			$(OBJ)/memory.o		$(OBJ)/egcmem.o		$(OBJ)/dmap.o		\
+			$(OBJ)/v30patch.o	$(OBJ)/memory.o		$(OBJ)/egcmem.o		\
+			$(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		\
@@ -88,14 +91,14 @@ NP2OBJ	=	$(OBJ)/strres.o		$(OBJ)/milstr.
 			$(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)/opngeng.oa	$(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	\
+			$(OBJ)/maketgrp.o	$(OBJ)/makegrph.oa	$(OBJ)/scrnbmp.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												\
@@ -105,16 +108,16 @@ 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)/np2.o		$(OBJ)/np2arg.o		$(OBJ)/dosio.o		\
-			$(OBJ)/extromio.o	$(OBJ)/trace.o		$(OBJ)/winloc.o		\
-			$(OBJ)/commng.o		$(OBJ)/cmserial.o	$(OBJ)/cmmidi.o		\
-			$(OBJ)/cmpara.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)/juliet.o		$(OBJ)/sstp.o		$(OBJ)/sstpmsg.o	\
-			$(OBJ)/winkbd.o		$(OBJ)/dclock.o		$(OBJ)/dclockd.o	\
-			$(OBJ)/menu.o		$(OBJ)/ini.o		$(OBJ)/np2info.o	\
-			$(OBJ)/np2res.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	\
+			$(OBJ)/cmmidi.o		$(OBJ)/cmpara.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)/juliet.o		$(OBJ)/sstp.o		\
+			$(OBJ)/sstpmsg.o	$(OBJ)/winkbd.o		$(OBJ)/dclock.o		\
+			$(OBJ)/dclockd.o	$(OBJ)/menu.o		$(OBJ)/ini.o		\
+			$(OBJ)/np2info.o	$(OBJ)/toolwin.o	$(OBJ)/np2res.o		\
 			$(OBJ)/d_about.o	$(OBJ)/d_config.o	$(OBJ)/d_mpu98.o	\
 			$(OBJ)/d_screen.o	$(OBJ)/d_serial.o	$(OBJ)/d_sound.o	\
 			$(OBJ)/d_clnd.o		$(OBJ)/d_disk.o		$(OBJ)/d_bmp.o		\
@@ -190,11 +193,14 @@ $(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)/i286c.o		:	$(I286C)/i286c.c $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(I286C)/i286.h $(I286C)/i286c.h $(I286C)/memory.h \
-						$(I286C)/dmap.h $(I286C)/i286c.mcr
+						$(I286C)/i286.h $(I286C)/i286c.h $(I286C)/v30patch.h \
+						$(I286C)/memory.h $(I286C)/dmap.h $(I286C)/i286c.mcr
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/i286c_mn.o	:	$(I286C)/i286c_mn.c $(HEADERS) $(PCCORES) $(IOCORES) \
@@ -232,6 +238,12 @@ $(OBJ)/i286c_rp.o	:	$(I286C)/i286c_rp.c 
 						$(I286C)/i286c.mcr
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/v30patch.o	:	$(I286C)/v30patch.c $(HEADERS) $(PCCORES) $(IOCORES) \
+						$(I286C)/i286.h $(I286C)/i286c.h $(I286C)/v30patch.h \
+						$(I286C)/memory.h $(I286C)/dmap.h $(BIOS)/bios.h \
+						$(I286C)/i286c.mcr
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/memory.o		:	$(I286C)/memory.c $(HEADERS) $(PCCORES) $(IOCORES) \
 						$(I286C)/i286.h $(I286C)/memory.h $(I286C)/egcmem.h \
 						$(VRAM)/vram.h $(FONT)/font.h
@@ -518,12 +530,15 @@ $(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 $(KEYDISP)/keydisp.h
 	$(CC) $(COPT) -o $@ $<
 
-$(OBJ)/psggeng.o	:	$(SOUND)/psggeng.c $(HEADERS) $(SOUND)/sound.h \
-						$(SOUND)/psggen.h
+$(OBJ)/psggeng.o	:	$(SOUND)/psggeng.c $(HEADERS) $(COMMON)/parts.h \
+						$(SOUND)/sound.h $(SOUND)/psggen.h
 	$(CC) $(COPT) -o $@ $<
 
 $(OBJ)/rhythmc.o	:	$(SOUND)/rhythmc.c $(HEADERS) $(COMMON)/wavefile.h \
@@ -630,6 +645,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 \
@@ -753,8 +771,9 @@ $(OBJ)/fontmake.o	:	$(FONT)/fontmake.c $
 
 
 $(OBJ)/np2.o		:	$(TARGET)/np2.cpp $(HEADERS) $(PCCORES) $(IOCORES) \
-						$(COMMON)/strres.h $(TARGET)/resource.h \
-						$(TARGET)/np2.h $(TARGET)/np2arg.h \
+						$(COMMON)/strres.h $(COMMON)/parts.h \
+						$(TARGET)/resource.h $(TARGET)/np2.h \
+						$(TARGET)/np2arg.h $(X86ASM)/cputype.h \
 						$(TARGET)/dosio.h $(TARGET)/extromio.h \
 						$(TARGET)/commng.h $(TARGET)/joymng.h \
 						$(TARGET)/mousemng.h $(TARGET)/scrnmng.h \
@@ -775,6 +794,9 @@ $(OBJ)/np2arg.o		:	$(TARGET)/np2arg.cpp 
 						$(TARGET)/dosio.h
 	$(CC) $(COPT) -o $@ $<
 
+$(OBJ)/cputype.oa	:	$(X86ASM)/cputype.x86
+	$(AS) $(AOPT) $< -o $@
+
 $(OBJ)/dosio.o		:	$(TARGET)/dosio.cpp $(HEADERS) $(TARGET)/dosio.h
 	$(CC) $(COPT) -o $@ $<
 
@@ -888,6 +910,13 @@ $(OBJ)/np2info.o	:	$(TARGET)/np2info.cpp
 						$(I286C)/memory.h $(BIOS)/bios.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 \
+						$(TARGET)/toolwin.h $(TARGET)/ini.h \
+						$(DIALOG)/dialog.h $(FDD)/diskdrv.h
+	$(CC) $(COPT) -o $@ $<
+
 $(OBJ)/np2res.o		:	$(TARGET)/np2res.rc $(TARGET)/resource.h
 	$(RC) -i $< -o $@