--- np2/x11/sdl/Attic/Makefile	2003/12/19 16:08:02	1.1
+++ np2/x11/sdl/Attic/Makefile	2004/01/23 14:35:46	1.4
@@ -10,8 +10,8 @@ CINCLUDES=	-I. -I.. -I../.. -I../../comm
 		-I../../vram \
 		-I../../embed -I../../embed/menu -I../../embed/menubase \
 		`$(SDL_CONFIG) --cflags` \
-		-DUSE_SDL -DUSE_SYSMENU
-COPTS?=		-O2 -W -Wall -Wpointer-arith -DUSE_SDLAUDIO
+		-DUSE_SDL=1
+COPTS?= 	-O2 -W -Wall -Wpointer-arith -DUSE_SDLAUDIO
 SYSRESPATH?=	/usr/X11R6/lib/X11/xnp2
 
 CFLAGS=		$(COPTS) $(CINCLUDES) -fsigned-char \
@@ -39,23 +39,16 @@ COMMONOBJS=	../../common/strres.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
+		../../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
-
-FDDOBJS=	../../fdd/diskdrv.o ../../fdd/newdisk.o ../../fdd/fddfile.o \
-		../../fdd/fdd_xdf.o ../../fdd/fdd_d88.o ../../fdd/fdd_mtr.o \
-		../../fdd/sxsi.o
-
-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 \
+		../../cbus/cs4231io.o ../../cbus/pcm86io.o \
+		../../cbus/sasiio.o ../../cbus/scsicmd.o ../../cbus/scsiio.o \
 
 EMBEDOBJS=	../../embed/vramhdl.o ../../embed/vrammix.o
 
@@ -73,14 +66,27 @@ MENUBASEOBJS=	../../embed/menubase/menub
 		../../embed/menubase/menusys.o \
 		../../embed/menubase/menuvram.o
 
+FDDOBJS=	../../fdd/diskdrv.o ../../fdd/newdisk.o ../../fdd/fddfile.o \
+		../../fdd/fdd_xdf.o ../../fdd/fdd_d88.o ../../fdd/fdd_mtr.o \
+		../../fdd/sxsi.o
+
+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 \
+
+GENERICOBJS=	../../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/gdc_sub.o ../../io/gdc_pset.o ../../io/itf.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/serial.o ../../io/sysport.o ../../io/upd4990.o \
+		../../io/necio.o ../../io/epsonio.o
 
 LIOOBJS=	../../lio/lio.o ../../lio/gscreen.o ../../lio/gview.o \
 		../../lio/gcolor1.o ../../lio/gcolor2.o ../../lio/gcls.o \
@@ -99,7 +105,12 @@ SOUNDOBJS=	../../sound/sound.o ../../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 \
@@ -125,9 +136,11 @@ X11SDLOBJS=	sdl_font.o sdl_keyboard.o sd
 		sdl_main.o
 
 OBJS=		$(CPUOBJS) $(COMMONOBJS) $(BIOSOBJS) $(CBUSOBJS) $(FDDOBJS) \
-		$(FONTOBJS) $(IOOBJS) $(LIOOBJS) $(NP2OBJS) $(SOUNDOBJS) \
+		$(FONTOBJS) $(IOOBJS) $(LIOOBJS) $(NP2OBJS) \
+		$(SOUNDOBJS) $(GETSNDOBJS) \
 		$(VERMOUTHOBJS) $(VRAMOBJS) $(SNDDRVOBJS) \
 		$(EMBEDOBJS) $(MENUOBJS) $(MENUBASEOBJS) \
+		$(GENERICOBJS) \
 		$(X11OBJS) $(X11SDLOBJS)
 SRCS=		$(OBJS:.o=.c)