--- np2/win9xc/Makefile 2003/12/08 02:09:17 1.1 +++ np2/win9xc/Makefile 2004/01/15 07:23:35 1.5 @@ -24,6 +24,7 @@ CBUS = ../cbus BIOS = ../bios SOUND = ../sound VERMOUTH = ../sound/vermouth +GETSND = ../sound/getsnd VRAM = ../vram FDD = ../fdd LIO = ../lio @@ -36,14 +37,17 @@ HEADERS = $(TARGET)/compiler.h $(BASE)/ $(COMMON)/_memory.h $(COMMON)/rect.h $(COMMON)/lstarray.h \ $(TARGET)/trace.h +CPUCORES = $(I386C)/cpucore.h $(I386C)/memory.h + PCCORES = $(BASE)/pccore.h $(BASE)/nevent.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 \ - $(IO)/extmem.h $(IO)/fdc.h $(IO)/fdd320.h $(IO)/gdc.h \ - $(IO)/gdc_cmd.h $(IO)/gdc_sub.h $(IO)/itf.h $(IO)/mouseif.h \ - $(IO)/nmiio.h $(IO)/np2sysp.h $(IO)/pic.h $(IO)/pit.h \ - $(IO)/printif.h $(IO)/serial.h $(IO)/sysport.h $(IO)/upd4990.h + $(IO)/epsonio.h $(IO)/extmem.h $(IO)/fdc.h $(IO)/fdd320.h \ + $(IO)/gdc.h $(IO)/gdc_cmd.h $(IO)/gdc_sub.h $(IO)/mouseif.h \ + $(IO)/necio.h $(IO)/nmiio.h $(IO)/np2sysp.h $(IO)/pic.h \ + $(IO)/pit.h $(IO)/printif.h $(IO)/serial.h $(IO)/sysport.h \ + $(IO)/upd4990.h FMBOARDS = $(SOUND)/soundrom.h $(SOUND)/tms3631.h $(SOUND)/fmtimer.h \ $(SOUND)/opngen.h $(SOUND)/psggen.h $(SOUND)/rhythm.h \ @@ -56,11 +60,11 @@ VERMOUTHS = $(VERMOUTH)/midiout.h $(VERM AOPT = -f win32 COPT = -c -Wall -pipe -O6 -fomit-frame-pointer -fkeep-inline-functions \ -fsigned-char -mno-cygwin -march=pentium \ - -DWIN32 -DNDEBUG -D_WINDOWS -DCPU386 -DTRACE \ + -DWIN32 -DNDEBUG -D_WINDOWS -DCPUCORE_IA32 -DTRACE \ -I$(BASE) -I$(COMMON) -I$(I386C) -I$(IA32) -I$(IA32INST) \ -I$(IA32FPU) -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$(VERMOUTH) -I$(GETSND) -I$(VRAM) -I$(FDD) -I$(LIO) -I$(FONT) \ + -I$(GENERIC) -I$(TARGET) -I$(DIALOG) LOPT = -mno-cygwin -lstdc++ NP2OBJ = $(OBJ)/strres.o $(OBJ)/milstr.o $(OBJ)/_memory.o \ @@ -69,30 +73,32 @@ NP2OBJ = $(OBJ)/strres.o $(OBJ)/milstr. $(OBJ)/parts.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 \ - $(OBJ)/fdc.o $(OBJ)/fdd320.o $(OBJ)/gdc.o \ - $(OBJ)/gdc_sub.o $(OBJ)/gdc_pset.o $(OBJ)/itf.o \ - $(OBJ)/mouseif.o $(OBJ)/nmiio.o $(OBJ)/np2sysp.o \ - $(OBJ)/pic.o $(OBJ)/pit.o $(OBJ)/printif.o \ - $(OBJ)/serial.o $(OBJ)/sysport.o $(OBJ)/upd4990.o \ + $(OBJ)/dmac.o $(OBJ)/egc.o $(OBJ)/epsonio.o \ + $(OBJ)/extmem.o $(OBJ)/fdc.o $(OBJ)/fdd320.o \ + $(OBJ)/gdc.o $(OBJ)/gdc_sub.o $(OBJ)/gdc_pset.o \ + $(OBJ)/mouseif.o $(OBJ)/necio.o $(OBJ)/nmiio.o \ + $(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)/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)/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)/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)/sound.o $(OBJ)/sndcsec.o $(OBJ)/wavemix.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)/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 \ @@ -105,7 +111,7 @@ 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)/cmver.o $(OBJ)/dipswbmp.o \ + $(OBJ)/cmjasts.o $(OBJ)/cmver.o $(OBJ)/dipswbmp.o \ $(OBJ)/np2.o $(OBJ)/np2arg.o $(OBJ)/dosio.o \ $(OBJ)/trace.o $(OBJ)/commng.o $(OBJ)/fontmng.o \ $(OBJ)/joymng.o $(OBJ)/mousemng.o $(OBJ)/scrnmng.o \ @@ -123,7 +129,7 @@ NP2OBJ = $(OBJ)/strres.o $(OBJ)/milstr. $(OBJ)/ctrlxfer.o $(OBJ)/exception.o $(OBJ)/groups.o \ $(OBJ)/ia32.o $(OBJ)/inst_table.o $(OBJ)/interface.o \ $(OBJ)/paging.o $(OBJ)/resolve.o $(OBJ)/segments.o \ - $(OBJ)/task.o \ + $(OBJ)/task.o $(OBJ)/iadebug.o \ $(OBJ)/bin_arith.o $(OBJ)/bit_byte.o \ $(OBJ)/ctrl_trans.o $(OBJ)/data_trans.o \ $(OBJ)/dec_arith.o $(OBJ)/flag_ctrl.o \ @@ -229,6 +235,9 @@ $(OBJ)/egc.o : $(IO)/egc.c $(HEADERS) $ $(I386C)/memory.h $(I386C)/egcmem.h $(VRAM)/vram.h $(CC) $(COPT) -o $@ $< +$(OBJ)/epsonio.o : $(IO)/epsonio.c $(HEADERS) $(PCCORES) $(IOCORES) + $(CC) $(COPT) -o $@ $< + $(OBJ)/extmem.o : $(IO)/extmem.c $(HEADERS) $(PCCORES) $(IOCORES) \ $(I386C)/cpucore.h $(I386C)/memory.h $(CC) $(COPT) -o $@ $< @@ -254,13 +263,13 @@ $(OBJ)/gdc_pset.o : $(IO)/gdc_pset.c $(H $(I386C)/memory.h $(IO)/gdc_pset.h $(VRAM)/vram.h $(CC) $(COPT) -o $@ $< -$(OBJ)/itf.o : $(IO)/itf.c $(HEADERS) $(PCCORES) $(IOCORES) - $(CC) $(COPT) -o $@ $< - $(OBJ)/mouseif.o : $(IO)/mouseif.c $(HEADERS) $(PCCORES) $(IOCORES) \ $(TARGET)/mousemng.h $(I386C)/cpucore.h $(CC) $(COPT) -o $@ $< +$(OBJ)/necio.o : $(IO)/necio.c $(HEADERS) $(PCCORES) $(IOCORES) + $(CC) $(COPT) -o $@ $< + $(OBJ)/nmiio.o : $(IO)/nmiio.c $(HEADERS) $(PCCORES) $(IOCORES) \ $(I386C)/cpucore.h $(CC) $(COPT) -o $@ $< @@ -430,6 +439,11 @@ $(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 \ $(I386C)/cpucore.h $(CBUS)/cbuscore.h \ @@ -538,6 +552,23 @@ $(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.c + $(CC) $(COPT) -o $@ $< + +$(OBJ)/getmp3.o : $(GETSND)/getmp3.c $(HEADERS) $(GETSND)/getsnd.c + $(CC) $(COPT) -o $@ $< + +$(OBJ)/getogg.o : $(GETSND)/getogg.c $(HEADERS) $(GETSND)/getsnd.c + $(CC) $(COPT) -o $@ $< + +$(OBJ)/getsmix.o : $(GETSND)/getsmix.c $(HEADERS) $(GETSND)/getsnd.c + $(CC) $(COPT) -o $@ $< + + + $(OBJ)/vram.o : $(VRAM)/vram.c $(HEADERS) $(I386C)/memory.h \ $(VRAM)/vram.h $(CC) $(COPT) -o $@ $< @@ -703,6 +734,11 @@ $(OBJ)/fontmake.o : $(FONT)/fontmake.c $ +$(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 @@ -965,6 +1001,10 @@ $(OBJ)/segments.o : $(IA32)/segments.c $(OBJ)/task.o : $(IA32)/task.c $(CC) $(COPT) -o $@ $< +$(OBJ)/iadebug.o : $(IA32)/debug.c + $(CC) $(COPT) -o $@ $< + + $(OBJ)/bin_arith.o : $(IA32INST)/bin_arith.c $(CC) $(COPT) -o $@ $<