--- np2/x11/Attic/Imakefile	2004/01/07 14:47:46	1.9
+++ np2/x11/Attic/Imakefile	2004/02/19 14:22:56	1.14
@@ -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)
@@ -97,6 +99,8 @@ CPUOBJS= \
 		../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 \
@@ -142,12 +146,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 \
@@ -155,13 +161,14 @@ 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
+GENERICOBJS=	../generic/cmndraw.o ../generic/keydisp.o ../generic/cmjasts.o \
+		../generic/hostdrv.o ../generic/hostdrvs.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 \
@@ -172,7 +179,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 \
@@ -184,7 +191,12 @@ SOUNDOBJS=	../sound/sound.o ../sound/sou
 		../sound/psggenc.o ../sound/psggeng.o \
 		../sound/rhythmc.o ../sound/rhythmg.o \
 		../sound/sndcsec.o \
-		../sound/tms3631c.o ../sound/tms3631g.o
+		../sound/tms3631c.o ../sound/tms3631g.o \
+		../sound/wavemix.o
+
+GETSNDOBJS=	../sound/getsnd/getsnd.o ../sound/getsnd/getsmix.o \
+		../sound/getsnd/getmp3.o ../sound/getsnd/getogg.o \
+		../sound/getsnd/getwave.o
 
 VERMOUTHOBJS=	../sound/vermouth/midiout.o ../sound/vermouth/midimod.o \
 		../sound/vermouth/midinst.o ../sound/vermouth/midvoice.o \
@@ -212,14 +224,15 @@ GTKDEPOBJS=	gtk/dialog_about.o gtk/dialo
 		gtk/gtk_main.o gtk/gtk_wrapper.o
 
 OBJS=		$(COMMONOBJS) $(BIOSOBJS) $(CBUSOBJS) $(FDDOBJS) $(FONTOBJS) \
-		$(IOOBJS) $(LIOOBJS) $(NP2OBJS) $(SOUNDOBJS) $(VERMOUTHOBJS) \
-		$(VRAMOBJS) $(GENERICOBJS) $(CPUOBJS) \
+		$(IOOBJS) $(LIOOBJS) $(NP2OBJS) $(SOUNDOBJS) $(GETSNDOBJS) \
+		$(VERMOUTHOBJS) $(VRAMOBJS) $(GENERICOBJS) $(CPUOBJS) \
 		$(X11OBJS) $(DEBUGOBJS) $(SNDDRVOBJS) $(GTKDEPOBJS)
 
 CSRCS=		$(COMMONOBJS:.o=.c) $(BIOSOBJS:.o=.c) $(CBUSOBJS:.o=.c) \
 		$(FDDOBJS:.o=.c) $(FONTOBJS:.o=.c) $(IOOBJS:.o=.c) \
-		$(LIOOBJS:.o=.c) $(NP2OBJS:.o=.c) $(SOUNDOBJS:.o=.c) \
-		$(VERMOUTHOBJS:.o=.c) $(VRAMOBJS:.o=.c) $(GENERICOBJS:.o=.c) \
+		$(LIOOBJS:.o=.c) $(NP2OBJS:.o=.c) \
+		$(SOUNDOBJS:.o=.c) $(GETSNDOBJS:.o=.c) $(VERMOUTHOBJS:.o=.c) \
+		$(VRAMOBJS:.o=.c) $(GENERICOBJS:.o=.c) \
 		$(CPUOBJS:.o=.c) \
 		$(DEBUGOBJS:.o=.c) $(SNDDRVOBJS:.o=.c) $(X11OBJS:.o=.c) \
 		$(GTKDEPOBJS:.o=.c)
@@ -234,6 +247,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)