--- np2/sdl/makefile.zau 2004/01/05 06:05:11 1.8 +++ np2/sdl/makefile.zau 2004/01/22 02:11:26 1.9 @@ -23,6 +23,7 @@ CBUS = ../cbus BIOS = ../bios SOUND = ../sound VERMOUTH = ../sound/vermouth +GETSND = ../sound/getsnd VRAM = ../vram FDD = ../fdd LIO = ../lio @@ -40,7 +41,7 @@ HEADERS = $(TARGET2)/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 \ @@ -68,9 +69,9 @@ EMBEDS = $(EMBED)/vramhdl.h $(EMBED)/vr COPT = -c -Wall -pipe -O3 -Wpointer-arith -fno-exceptions -fno-rtti \ -fomit-frame-pointer -fsigned-char \ -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$(EMBED) -I$(MENU) -I$(MENUBASE) -I$(TARGET) \ - -I$(TARGET2) `$(SDL_CONFIG) --cflags` + -I$(SOUND) -I$(VERMOUTH) -I$(GETSND) -I$(VRAM) -I$(FDD) -I$(LIO) \ + -I$(FONT) -I$(GENERIC) -I$(EMBED) -I$(MENU) -I$(MENUBASE) \ + -I$(TARGET) -I$(TARGET2) `$(SDL_CONFIG) --cflags` LOPT = NP2OBJ = $(OBJ)/strres.o $(OBJ)/milstr.o $(OBJ)/_memory.o \ @@ -97,10 +98,12 @@ NP2OBJ = $(OBJ)/strres.o $(OBJ)/milstr. $(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 \ @@ -374,6 +377,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 @@ -493,6 +513,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) \ @@ -612,6 +637,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 $@ $< @@ -782,14 +825,24 @@ $(OBJ)/fontmake.o : $(FONT)/fontmake.c $ +$(OBJ)/cmver.o : $(GENERIC)/cmver.c $(HEADERS) $(TARGET)/commng.h \ + $(SOUND)/sound.h $(VERMOUTH)/vermouth.h \ + $(GENERIC)/keydisp.h $(GENERIC)/cmver.h + $(CC) $(COPT) -o $@ $< + $(OBJ)/cmjasts.o : $(GENERIC)/cmjasts.c $(HEADERS) $(CPUCORES) \ $(TARGET)/commng.h $(SOUND)/sound.h \ $(GENERIC)/cmjasts.h $(CC) $(COPT) -o $@ $< -$(OBJ)/cmver.o : $(GENERIC)/cmver.c $(HEADERS) $(TARGET)/commng.h \ - $(SOUND)/sound.h $(VERMOUTH)/vermouth.h \ - $(GENERIC)/keydisp.h $(GENERIC)/cmver.h +$(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 $@ $<