--- np2/sdl/makefile.zau 2003/12/22 10:35:16 1.5 +++ np2/sdl/makefile.zau 2003/12/26 23:30:26 1.6 @@ -38,6 +38,8 @@ HEADERS = $(TARGET2)/compiler.h $(BASE) $(COMMON)/_memory.h $(COMMON)/rect.h $(COMMON)/lstarray.h \ $(TARGET)/trace.h +CPUCORES = $(I286C)/cpucore.h $(I286C)/memory.h + PCCORES = $(BASE)/pccore.h $(BASE)/nevent.h IOCORES = $(IO)/iocore.h $(IO)/artic.h $(IO)/cgrom.h $(IO)/cpuio.h \ @@ -81,12 +83,13 @@ NP2OBJ = $(OBJ)/strres.o $(OBJ)/milstr. $(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 \ - $(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)/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)/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 \ @@ -118,7 +121,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)/cmjasts.o $(OBJ)/cmver.o \ $(OBJ)/vramhdl.o $(OBJ)/vrammix.o \ $(OBJ)/menustr.o $(OBJ)/filesel.o $(OBJ)/dlgcfg.o \ $(OBJ)/dlgscr.o $(OBJ)/dlgabout.o \ @@ -296,6 +299,9 @@ $(OBJ)/egc.o : $(IO)/egc.c $(HEADERS) $ $(I286C)/memory.h $(I286C)/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) \ $(I286C)/cpucore.h $(I286C)/memory.h $(CC) $(COPT) -o $@ $< @@ -775,6 +781,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