--- np2/x11/Attic/Imakefile 2004/02/20 16:06:09 1.15 +++ np2/x11/Attic/Imakefile 2004/03/23 15:16:43 1.18 @@ -86,74 +86,23 @@ LOCAL_LIBRARIES= $(XLIB) $(PTHREAD_LIB) #define PassCDebugFlags -#if defined(CPUCORE_IA32) - -CPUOBJS= \ - ../i386c/cpucore.o \ - ../i386c/dmap.o \ - ../i386c/egcmem.o \ - ../i386c/memory.o \ - ../i386c/ia32/interface.o \ - ../i386c/ia32/ia32.o \ - ../i386c/ia32/cpu.o \ - ../i386c/ia32/cpu_io.o \ - ../i386c/ia32/cpu_mem.o \ - ../i386c/ia32/ctrlxfer.o \ - ../i386c/ia32/debug.o \ - ../i386c/ia32/disasm.o \ - ../i386c/ia32/exception.o \ - ../i386c/ia32/groups.o \ - ../i386c/ia32/inst_table.o \ - ../i386c/ia32/paging.o \ - ../i386c/ia32/resolve.o \ - ../i386c/ia32/segments.o \ - ../i386c/ia32/task.o \ - ../i386c/ia32/instructions/bin_arith.o \ - ../i386c/ia32/instructions/bit_byte.o \ - ../i386c/ia32/instructions/ctrl_trans.o \ - ../i386c/ia32/instructions/data_trans.o \ - ../i386c/ia32/instructions/dec_arith.o \ - ../i386c/ia32/instructions/flag_ctrl.o \ - ../i386c/ia32/instructions/logic_arith.o \ - ../i386c/ia32/instructions/misc_inst.o \ - ../i386c/ia32/instructions/seg_reg.o \ - ../i386c/ia32/instructions/shift_rotate.o \ - ../i386c/ia32/instructions/string_inst.o \ - ../i386c/ia32/instructions/system_inst.o \ - ../i386c/ia32/instructions/fpu/fpdummy.o - -CPUFLAGS= -DCPUCORE_IA32 \ - -I../i386c -I../i386c/ia32 \ - -I../i386c/ia32/instructions -I../i386c/ia32/instructions/fpu - -#else - -CPUOBJS= ../i286c/i286c.o ../i286c/i286c_mn.o ../i286c/i286c_ea.o \ - ../i286c/i286c_0f.o ../i286c/i286c_8x.o ../i286c/i286c_sf.o \ - ../i286c/i286c_f6.o ../i286c/i286c_fe.o ../i286c/i286c_rp.o \ - ../i286c/memory.o ../i286c/egcmem.o ../i286c/dmap.o \ - ../i286c/v30patch.o - -CPUFLAGS= -I../i286c - -#endif - COMMONOBJS= ../common/strres.o ../common/milstr.o ../common/_memory.o \ ../common/textfile.o ../common/profile.o ../common/rect.o \ ../common/lstarray.o ../common/bmpdata.o ../common/mimpidef.o \ ../common/codecnv.o ../common/parts.o ../common/wavefile.o -BIOSOBJS= ../bios/bios.o ../bios/bios02.o ../bios/bios08.o \ - ../bios/bios09.o ../bios/bios0c.o ../bios/bios12.o \ - ../bios/bios13.o ../bios/bios18.o ../bios/bios19.o \ - ../bios/bios1a.o ../bios/bios1b.o ../bios/bios1c.o \ +BIOSOBJS= ../bios/bios.o ../bios/bios09.o ../bios/bios0c.o \ + ../bios/bios12.o ../bios/bios13.o ../bios/bios18.o \ + ../bios/bios19.o ../bios/bios1a.o ../bios/bios1b.o \ + ../bios/bios1c.o ../bios/bios1f.o \ ../bios/sxsibios.o CBUSOBJS= ../cbus/cbuscore.o ../cbus/pc9861k.o ../cbus/mpu98ii.o \ ../cbus/amd98.o ../cbus/board118.o ../cbus/board14.o \ ../cbus/board26k.o ../cbus/board86.o ../cbus/boardspb.o \ ../cbus/boardx2.o ../cbus/cs4231io.o ../cbus/pcm86io.o \ - ../cbus/sasiio.o ../cbus/scsiio.o ../cbus/scsicmd.o + ../cbus/sasiio.o ../cbus/scsiio.o ../cbus/scsicmd.o \ + ../cbus/ideio.o ../cbus/atapicmd.o FDDOBJS= ../fdd/diskdrv.o ../fdd/newdisk.o ../fdd/fddfile.o \ ../fdd/fdd_xdf.o ../fdd/fdd_d88.o ../fdd/fdd_mtr.o \ @@ -165,7 +114,7 @@ FONTOBJS= ../font/font.o ../font/fontdat GENERICOBJS= ../generic/cmndraw.o ../generic/keydisp.o ../generic/cmjasts.o \ ../generic/hostdrv.o ../generic/hostdrvs.o ../generic/unasm.o \ - ../generic/np2info.o + ../generic/np2info.o ../generic/memdbg32.o IOOBJS= ../io/iocore.o ../io/artic.o ../io/cgrom.o ../io/cpuio.o \ ../io/crtc.o ../io/dipsw.o ../io/dmac.o ../io/egc.o \ @@ -173,14 +122,13 @@ IOOBJS= ../io/iocore.o ../io/artic.o .. ../io/gdc_sub.o ../io/gdc_pset.o ../io/mouseif.o \ ../io/nmiio.o ../io/np2sysp.o ../io/pic.o ../io/pit.o \ ../io/printif.o ../io/serial.o ../io/sysport.o ../io/upd4990.o \ - ../io/necio.o ../io/epsonio.o + ../io/necio.o ../io/epsonio.o ../io/pcidev.o -LIOOBJS= ../lio/lio.o ../lio/gscreen.o ../lio/gview.o ../lio/gcolor1.o \ - ../lio/gcolor2.o ../lio/gcls.o ../lio/gpset.o ../lio/gline.o \ +LIOOBJS= ../lio/lio.o ../lio/gscreen.o ../lio/gpset.o ../lio/gline.o \ ../lio/gput1.o NP2OBJS= ../pccore.o ../nevent.o ../calendar.o ../timing.o \ - ../debugsub.o ../statsave.o ../keystat.o + ../statsave.o ../keystat.o SOUNDOBJS= ../sound/sound.o ../sound/soundrom.o ../sound/s98.o \ ../sound/adpcmc.o ../sound/adpcmg.o \ @@ -190,10 +138,8 @@ SOUNDOBJS= ../sound/sound.o ../sound/sou ../sound/opngenc.o ../sound/opngeng.o \ ../sound/pcm86c.o ../sound/pcm86g.o \ ../sound/psggenc.o ../sound/psggeng.o \ - ../sound/rhythmc.o ../sound/rhythmg.o \ - ../sound/sndcsec.o \ - ../sound/tms3631c.o ../sound/tms3631g.o \ - ../sound/wavemix.o + ../sound/rhythmc.o ../sound/sndcsec.o \ + ../sound/tms3631c.o ../sound/tms3631g.o GETSNDOBJS= ../sound/getsnd/getsnd.o ../sound/getsnd/getsmix.o \ ../sound/getsnd/getmp3.o ../sound/getsnd/getogg.o \ @@ -205,7 +151,8 @@ VERMOUTHOBJS= ../sound/vermouth/midiout. VRAMOBJS= ../vram/vram.o ../vram/scrndraw.o ../vram/sdraw.o \ ../vram/dispsync.o ../vram/palettes.o ../vram/maketext.o \ - ../vram/maketgrp.o ../vram/makegrph.o ../vram/scrnbmp.o + ../vram/maketgrp.o ../vram/makegrph.o ../vram/scrnbmp.o \ + ../vram/makegrex.o X11OBJS= dosio.o ini.o trace.o toolkit.o cmmidi.o kdispwin.o \ drawmng.o kbdmng.o \ @@ -219,11 +166,68 @@ SNDDRVOBJS= snddrv/esd.o snddrv/netbsd.o GTKDEPOBJS= gtk/dialog_about.o gtk/dialog_calendar.o gtk/dialog_config.o \ gtk/dialog_file_selection.o gtk/dialog_midi.o \ gtk/dialog_newdisk.o gtk/dialog_screen.o gtk/dialog_sound.o \ - gtk/window_keydisp.o gtk/window_viewer.o \ + gtk/window_debug.o gtk/window_keydisp.o gtk/window_viewer.o \ gtk/gtk_drawmng.o gtk/gtk_screen.o gtk/gtk_font.o \ gtk/gtk_keyboard.o gtk/gtk_menu.o gtk/gtk_mouse.o \ gtk/gtk_main.o gtk/gtk_wrapper.o +#if defined(CPUCORE_IA32) + +CPUOBJS= \ + ../i386c/cpucore.o \ + ../i386c/dmap.o \ + ../i386c/egcmem.o \ + ../i386c/memory.o \ + ../i386c/mem9821.o \ + ../i386c/ia32/interface.o \ + ../i386c/ia32/ia32.o \ + ../i386c/ia32/cpu.o \ + ../i386c/ia32/cpu_io.o \ + ../i386c/ia32/cpu_mem.o \ + ../i386c/ia32/ctrlxfer.o \ + ../i386c/ia32/debug.o \ + ../i386c/ia32/disasm.o \ + ../i386c/ia32/exception.o \ + ../i386c/ia32/groups.o \ + ../i386c/ia32/inst_table.o \ + ../i386c/ia32/paging.o \ + ../i386c/ia32/resolve.o \ + ../i386c/ia32/segments.o \ + ../i386c/ia32/task.o \ + ../i386c/ia32/instructions/bin_arith.o \ + ../i386c/ia32/instructions/bit_byte.o \ + ../i386c/ia32/instructions/ctrl_trans.o \ + ../i386c/ia32/instructions/data_trans.o \ + ../i386c/ia32/instructions/dec_arith.o \ + ../i386c/ia32/instructions/flag_ctrl.o \ + ../i386c/ia32/instructions/logic_arith.o \ + ../i386c/ia32/instructions/misc_inst.o \ + ../i386c/ia32/instructions/seg_reg.o \ + ../i386c/ia32/instructions/shift_rotate.o \ + ../i386c/ia32/instructions/string_inst.o \ + ../i386c/ia32/instructions/system_inst.o \ + ../i386c/ia32/instructions/fpu/fpdummy.o + +CPUFLAGS= -DCPUCORE_IA32 \ + -I../i386c -I../i386c/ia32 \ + -I../i386c/ia32/instructions -I../i386c/ia32/instructions/fpu + +NP2OBJS+= ../debugsub386.o + +#else + +CPUOBJS= ../i286c/i286c.o ../i286c/i286c_mn.o ../i286c/i286c_ea.o \ + ../i286c/i286c_0f.o ../i286c/i286c_8x.o ../i286c/i286c_sf.o \ + ../i286c/i286c_f6.o ../i286c/i286c_fe.o ../i286c/i286c_rp.o \ + ../i286c/memory.o ../i286c/egcmem.o ../i286c/dmap.o \ + ../i286c/v30patch.o + +CPUFLAGS= -I../i286c + +NP2OBJS+= ../debugsub.o + +#endif + OBJS= $(COMMONOBJS) $(BIOSOBJS) $(CBUSOBJS) $(FDDOBJS) $(FONTOBJS) \ $(IOOBJS) $(LIOOBJS) $(NP2OBJS) $(SOUNDOBJS) $(GETSNDOBJS) \ $(VERMOUTHOBJS) $(VRAMOBJS) $(GENERICOBJS) $(CPUOBJS) \