--- np2/x11/sdl/Attic/Makefile	2004/03/02 16:34:50	1.7
+++ np2/x11/sdl/Attic/Makefile	2005/04/01 15:35:06	1.8
@@ -2,10 +2,11 @@ PROG?= xnp2
 
 SDL_CONFIG?= sdl-config
 
-CINCLUDES=	-I. -I.. -I../.. -I../../common -I../../generic -I../debug \
+CINCLUDES=	-I. -I.. -I../.. -I../../common -I../../codecnv \
+		-I../../generic -I../debug \
 		-I../../i286c \
 		-I../../bios -I../../cbus -I../../fdd -I../../font \
-		-I../../io -I../../lio \
+		-I../../io -I../../lio -I../../mem \
 		-I../../sound -I../../sound/vermouth -I../../sound/getsnd \
 		-I../../vram \
 		-I../../embed -I../../embed/menu -I../../embed/menubase \
@@ -25,22 +26,26 @@ CPUOBJS=	../../i286c/i286c.o ../../i286c
 		../../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/memory.o \
 		../../i286c/v30patch.o
 
+CODECNVOBJS=	../../codecnv/eucsjis.o ../../codecnv/eucucs2.o \
+		../../codecnv/sjiseuc.o ../../codecnv/sjisucs2.o \
+		../../codecnv/ucs2utf8.o ../../codecnv/utf8ucs2.o
+
 COMMONOBJS=	../../common/strres.o ../../common/milstr.o \
 		../../common/_memory.o ../../common/textfile.o \
 		../../common/profile.o ../../common/rect.o \
 		../../common/lstarray.o ../../common/parts.o \
-		../../common/codecnv.o ../../common/bmpdata.o \
+		../../common/bmpdata.o \
 		../../common/mimpidef.o ../../common/wavefile.o \
 		../../common/resize.o
 
-BIOSOBJS=	../../bios/bios.o ../../bios/bios02.o ../../bios/bios08.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/sxsibios.o
+                ../../bios/bios1f.o ../../bios/sxsibios.o
 
 CBUSOBJS=	../../cbus/cbuscore.o ../../cbus/pc9861k.o \
 		../../cbus/mpu98ii.o ../../cbus/amd98.o \
@@ -48,7 +53,8 @@ CBUSOBJS=	../../cbus/cbuscore.o ../../cb
 		../../cbus/board26k.o ../../cbus/board86.o \
 		../../cbus/boardspb.o ../../cbus/boardx2.o \
 		../../cbus/cs4231io.o ../../cbus/pcm86io.o \
-		../../cbus/sasiio.o ../../cbus/scsicmd.o ../../cbus/scsiio.o
+		../../cbus/sasiio.o ../../cbus/scsicmd.o ../../cbus/scsiio.o \
+		../../cbus/ideio.o ../../cbus/atapicmd.o
 
 EMBEDOBJS=	../../embed/vramhdl.o ../../embed/vrammix.o
 
@@ -68,7 +74,7 @@ MENUBASEOBJS=	../../embed/menubase/menub
 
 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
+		../../fdd/sxsi.o ../../fdd/sxsihdd.o ../../fdd/sxsicd.o
 
 FONTOBJS=	../../font/font.o ../../font/fontdata.o ../../font/fontmake.o \
 		../../font/fontpc88.o ../../font/fontpc98.o \
@@ -88,10 +94,13 @@ IOOBJS=		../../io/iocore.o ../../io/arti
 		../../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 \
+LIOOBJS=	../../lio/lio.o ../../lio/gscreen.o ../../lio/gcircle.o \
 		../../lio/gpset.o ../../lio/gline.o ../../lio/gput1.o
 
+MEMOBJS=	../../mem/dmav30.o ../../mem/dmax86.o ../../mem/memegc.o \
+		../../mem/memems.o ../../mem/memepp.o ../../mem/memtram.o \
+		../../mem/memvga.o ../../mem/memvram.o
+
 NP2OBJS=	../../pccore.o ../../nevent.o ../../calendar.o ../../timing.o \
 		../../debugsub.o ../../statsave.o ../../keystat.o
 
@@ -103,10 +112,8 @@ SOUNDOBJS=	../../sound/sound.o ../../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 \
@@ -125,8 +132,10 @@ VRAMOBJS=	../../vram/vram.o ../../vram/s
 SNDDRVOBJS=	../snddrv/esd.o ../snddrv/netbsd.o ../snddrv/oss.o \
 		../snddrv/sdl.o
 
-X11OBJS=	../dosio.o ../ini.o ../trace.o ../cmmidi.o ../np2.o \
-		../sysmenu.o ../toolkit.o \
+JOYDRVOBJS=	../joydrv/sdl.o
+
+X11OBJS=	../dosio.o ../ini.o ../trace.o ../cmmidi.o ../cmserial.o \
+		../np2.o ../sysmenu.o ../toolkit.o \
 		../drawmng.o ../inputmng.o ../kbdmng.o \
 		../commng.o ../joymng.o ../soundmng.o ../sysmng.o ../taskmng.o \
 		../timemng.o \
@@ -135,12 +144,14 @@ X11OBJS=	../dosio.o ../ini.o ../trace.o 
 X11SDLOBJS=	sdl_font.o sdl_keyboard.o sdl_mouse.o sdl_screen.o \
 		sdl_main.o
 
-OBJS=		$(CPUOBJS) $(COMMONOBJS) $(BIOSOBJS) $(CBUSOBJS) $(FDDOBJS) \
+OBJS=		$(CPUOBJS) $(COMMONOBJS) $(CODECNVOBJS) \
+		$(BIOSOBJS) $(CBUSOBJS) $(FDDOBJS) $(MEMOBJS) \
 		$(FONTOBJS) $(IOOBJS) $(LIOOBJS) $(NP2OBJS) \
 		$(SOUNDOBJS) $(GETSNDOBJS) \
-		$(VERMOUTHOBJS) $(VRAMOBJS) $(SNDDRVOBJS) \
+		$(VERMOUTHOBJS) $(VRAMOBJS) \
 		$(EMBEDOBJS) $(MENUOBJS) $(MENUBASEOBJS) \
 		$(GENERICOBJS) \
+		$(JOYDRVOBJS) $(SNDDRVOBJS) \
 		$(X11OBJS) $(X11SDLOBJS)
 SRCS=		$(OBJS:.o=.c)