--- np2/x11/Attic/Imakefile	2005/02/26 13:32:14	1.27
+++ np2/x11/Attic/Imakefile	2007/01/10 16:00:16	1.30
@@ -20,7 +20,7 @@ XCOMM
 
 #if defined(USE_GTK2) && !defined(USE_GTK2_GTK1)
 GTK_CONFIG?= pkg-config gtk+-2.0
-CFLAGS+= -DGTK_DISABLE_DEPRECATED
+CFLAGS+= -DGTK_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED
 GTK_DEFINE= -DUSE_GTK2=1
 
 GTKDEPOBJS=	gtk2/dialog_about.o gtk2/dialog_calendar.o \
@@ -112,6 +112,11 @@ LOCAL_LIBRARIES= $(XLIB) $(PTHREAD_LIB) 
 
 #define PassCDebugFlags
 
+#if defined(USE_XF86VIDMODE)
+DEPLIBS+= $(DEPXXF86VMLIB)
+DEFINES+= -DHAVE_XF86VIDMODE
+LOCAL_LIBRARIES+= $(XXF86VMLIB)
+#endif
 
 COMMONOBJS=	../common/strres.o ../common/milstr.o ../common/_memory.o \
 		../common/textfile.o ../common/profile.o ../common/rect.o \
@@ -137,7 +142,7 @@ CBUSOBJS=	../cbus/cbuscore.o ../cbus/pc9
 
 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 ../font/fontv98.o \
@@ -189,7 +194,7 @@ VRAMOBJS=	../vram/vram.o ../vram/scrndra
 		../vram/maketgrp.o ../vram/makegrph.o ../vram/scrnbmp.o \
 		../vram/makegrex.o
 
-X11OBJS=	dosio.o ini.o trace.o oemtext.o \
+X11OBJS=	dosio.o ini.o trace.o \
 		toolkit.o kdispwin.o skbdwin.o \
 		cmmidi.o cmserial.o \
 		drawmng.o kbdmng.o \