--- np2/win9x/Makefile 2004/01/05 06:05:11 1.14 +++ np2/win9x/Makefile 2004/01/22 01:54:38 1.16 @@ -21,6 +21,7 @@ CBUS = ../cbus BIOS = ../bios SOUND = ../sound VERMOUTH = ../sound/vermouth +GETSND = ../sound/getsnd VRAM = ../vram FDD = ../fdd LIO = ../lio @@ -37,7 +38,7 @@ HEADERS = $(TARGET)/compiler.h $(BASE)/ CPUCORES = $(I286C)/cpucore.h $(I286C)/memory.h -PCCORES = $(BASE)/pccore.h $(BASE)/nevent.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 \ @@ -60,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 \ @@ -82,16 +84,19 @@ NP2OBJ = $(OBJ)/strres.o $(OBJ)/milstr. $(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)/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)/sxsibios.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 \ @@ -113,7 +118,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)/cmjasts.o $(OBJ)/hostdrv.o $(OBJ)/hostdrvs.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 \ @@ -373,6 +378,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 @@ -492,6 +514,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) \ @@ -614,6 +641,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) $(I286C)/memory.h \ $(VRAM)/vram.h $(CC) $(COPT) -o $@ $< @@ -801,6 +846,16 @@ $(OBJ)/cmjasts.o : $(GENERIC)/cmjasts.c $(GENERIC)/cmjasts.h $(CC) $(COPT) -o $@ $< +$(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 $@ $< + $(OBJ)/np2.o : $(TARGET)/np2.cpp $(HEADERS) $(PCCORES) $(IOCORES) \ @@ -819,7 +874,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 $@ $< @@ -1146,8 +1201,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) \