--- np2/x11/Attic/Imakefile	2004/01/13 16:31:21	1.10
+++ np2/x11/Attic/Imakefile	2004/03/02 16:32:59	1.16
@@ -19,7 +19,7 @@ XCOMM GUI Toolkit
 XCOMM
 
 GTK_CONFIG?= gtk-config
-GTK_DEFINE= -DUSE_GTK
+GTK_DEFINE= -DUSE_GTK=1
 GTK_INCLUDE= `$(GTK_CONFIG) --cflags`
 GTK_LIB= `$(GTK_CONFIG) --libs`
 
@@ -76,7 +76,9 @@ SYS_LIBRARIES= -lm
 
 EXTRA_INCLUDES= -I. -I.. -I./debug -I../common \
 		-I../bios -I../cbus -I../fdd -I../font -I../generic \
-		-I../io -I../lio -I../sound -I../sound/vermouth -I../vram \
+		-I../io -I../lio \
+		-I../sound -I../sound/vermouth -I../sound/getsnd \
+		-I../vram \
 		$(PTHREAD_INCLUDE) $(GTK_INCLUDE) $(SDL_INCLUDE) $(ESD_INCLUDE)
 
 LOCAL_LIBRARIES= $(XLIB) $(PTHREAD_LIB) $(GTK_LIB) $(SDL_LIB) $(ESD_LIB)
@@ -91,6 +93,7 @@ CPUOBJS= \
 		../i386c/dmap.o \
 		../i386c/egcmem.o \
 		../i386c/memory.o \
+		../i386c/mem9821.o \
 		../i386c/ia32/interface.o \
 		../i386c/ia32/ia32.o \
 		../i386c/ia32/cpu.o \
@@ -98,6 +101,7 @@ CPUOBJS= \
 		../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 \
@@ -143,12 +147,14 @@ COMMONOBJS=	../common/strres.o ../common
 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
+		../bios/bios1a.o ../bios/bios1b.o ../bios/bios1c.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/boardx2.o ../cbus/cs4231io.o ../cbus/pcm86io.o \
+		../cbus/sasiio.o ../cbus/scsiio.o ../cbus/scsicmd.o
 
 FDDOBJS=	../fdd/diskdrv.o ../fdd/newdisk.o ../fdd/fddfile.o \
 		../fdd/fdd_xdf.o ../fdd/fdd_d88.o ../fdd/fdd_mtr.o \
@@ -156,14 +162,15 @@ FDDOBJS=	../fdd/diskdrv.o ../fdd/newdisk
 
 FONTOBJS=	../font/font.o ../font/fontdata.o ../font/fontmake.o \
 		../font/fontpc88.o ../font/fontpc98.o ../font/fontv98.o \
-		../font/fontfm7.o ../font/fontx1.o ../font/fontx68k.o \
+		../font/fontfm7.o ../font/fontx1.o ../font/fontx68k.o
 
 GENERICOBJS=	../generic/cmndraw.o ../generic/keydisp.o ../generic/cmjasts.o \
-		../generic/hostdrv.o ../generic/hostdrvs.o
+		../generic/hostdrv.o ../generic/hostdrvs.o ../generic/unasm.o \
+		../generic/np2info.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 \
-		../io/extmem.o ../io/fdc.o ../io/fdd320.o ../io/gdc.o \
+		../io/emsio.o ../io/fdc.o ../io/fdd320.o ../io/gdc.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 \
@@ -174,7 +181,7 @@ LIOOBJS=	../lio/lio.o ../lio/gscreen.o .
 		../lio/gput1.o
 
 NP2OBJS=	../pccore.o ../nevent.o ../calendar.o ../timing.o \
-		../debugsub.o ../statsave.o
+		../debugsub.o ../statsave.o ../keystat.o
 
 SOUNDOBJS=	../sound/sound.o ../sound/soundrom.o ../sound/s98.o \
 		../sound/adpcmc.o ../sound/adpcmg.o \
@@ -199,14 +206,15 @@ 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 \
 		commng.o joymng.o soundmng.o sysmng.o taskmng.o timemng.o \
 		main.o np2.o
 
-DEBUGOBJS=	debug/unasm.o debug/viewmem.o
+DEBUGOBJS=	debug/viewmem.o
 
 SNDDRVOBJS=	snddrv/esd.o snddrv/netbsd.o snddrv/oss.o snddrv/sdl.o
 
@@ -242,6 +250,11 @@ ComplexProgramTarget(xnp2)
 InstallMultipleFlags(resources/fddseek.wav, $(SYSRESPATH)/wav, $(INSTDATFLAGS))
 InstallMultipleFlags(resources/fddseek1.wav, $(SYSRESPATH)/wav, $(INSTDATFLAGS))
 
+XCOMM
+XCOMM for Release
+XCOMM
+XCOMM InstallMultipleFlags(../np2tool/np2tool.d88, $(SYSRESPATH)/fd, $(INSTDATFLAGS))
+
 clean::
 	$(RM) $(OBJS)