--- np2/x11/Attic/Imakefile	2005/03/05 13:25:17	1.29
+++ np2/x11/Attic/Imakefile	2008/03/13 16:27:39	1.33
@@ -1,5 +1,7 @@
+XCOMM	$Id: Imakefile,v 1.33 2008/03/13 16:27:39 monaka Exp $
+
 XCOMM
-XCOMM read config
+XCOMM user config
 XCOMM
 
 #include "config.tmpl"
@@ -18,10 +20,10 @@ XCOMM
 XCOMM GUI Toolkit
 XCOMM
 
-#if defined(USE_GTK2) && !defined(USE_GTK2_GTK1)
 GTK_CONFIG?= pkg-config gtk+-2.0
-CFLAGS+= -DGTK_DISABLE_DEPRECATED
-GTK_DEFINE= -DUSE_GTK2=1
+GTK_INCLUDE= `$(GTK_CONFIG) --cflags`
+GTK_LIB= `$(GTK_CONFIG) --libs`
+GTK_DEFINE=
 
 GTKDEPOBJS=	gtk2/dialog_about.o gtk2/dialog_calendar.o \
 		gtk2/dialog_config.o gtk2/dialog_midi.o gtk2/dialog_newdisk.o \
@@ -30,42 +32,12 @@ GTKDEPOBJS=	gtk2/dialog_about.o gtk2/dia
 		gtk2/gtk_drawmng.o gtk2/gtk_screen.o gtk2/gtk_font.o \
 		gtk2/gtk_keyboard.o gtk2/gtk_menu.o gtk2/gtk_mouse.o \
 		gtk2/gtk_main.o gtk2/gtk_wrapper.o
-#else	/* !(USE_GTK2 && !USE_GTK2_GTK1) */
-#if defined(USE_GTK2_GTK1)
-GTK_CONFIG?= pkg-config gtk+-2.0
-#else
-GTK_CONFIG?= gtk-config
-#endif
-GTK_DEFINE= -DUSE_GTK=1
-
-GTKDEPOBJS=	gtk/dialog_about.o gtk/dialog_calendar.o gtk/dialog_config.o \
-		gtk/dialog_file_selection.o gtk/dialog_midi.o \
-		gtk/dialog_newdisk.o gtk/dialog_screen.o gtk/dialog_sound.o \
-		gtk/window_debug.o gtk/window_keydisp.o gtk/window_viewer.o \
-		gtk/window_softkbd.o \
-		gtk/gtk_drawmng.o gtk/gtk_screen.o gtk/gtk_font.o \
-		gtk/gtk_keyboard.o gtk/gtk_menu.o gtk/gtk_mouse.o \
-		gtk/gtk_main.o gtk/gtk_wrapper.o
-#endif	/* USE_GTK2 && !USE_GTK2_GTK1 */
-GTK_INCLUDE= `$(GTK_CONFIG) --cflags`
-GTK_LIB= `$(GTK_CONFIG) --libs`
 
 
 XCOMM
 XCOMM Audio
 XCOMM
 
-#if defined(USE_NETBSDAUDIO) && defined(NetBSDArchitecture)
-SOUND_DEFINE+= -DUSE_NETBSDAUDIO
-#endif
-
-#if defined(USE_OSSAUDIO)
-SOUND_DEFINE+= -DUSE_OSSAUDIO
-#if defined(NetBSDArchitecture)
-SYS_LIBRARIES+= -lossaudio
-#endif /* NetBSDArchitecture */
-#endif
-
 #if defined(USE_SDLAUDIO) || defined(USE_SDLMIXER)
 SOUND_DEFINE+= -DUSE_SDLAUDIO
 SDL_CONFIG?= sdl-config
@@ -77,18 +49,6 @@ SDL_LIB+= -lSDL_mixer
 #endif
 #endif
 
-#if defined(USE_ESDAUDIO)
-SOUND_DEFINE+= -DUSE_ESDAUDIO
-ESD_CONFIG?= esd-config
-ESD_INCLUDE= `$(ESD_CONFIG) --cflags`
-ESD_LIB= `$(ESD_CONFIG) --libs`
-#endif
-
-#if (defined(USE_NETBSDAUDIO) && defined(NetBSDArchitecture)) || defined(USE_OSSAUDIO) || defined(USE_ESDAUDIO)
-PTHREAD_INCLUDE?=
-PTHREAD_LIB?= -lpthread
-#endif
-
 
 CDEBUGFLAGS+= -fsigned-char
 
@@ -106,12 +66,17 @@ EXTRA_INCLUDES= -I. -I.. -I./debug -I../
 		-I../io -I../lio -I../mem \
 		-I../sound -I../sound/vermouth -I../sound/getsnd \
 		-I../vram \
-		$(PTHREAD_INCLUDE) $(GTK_INCLUDE) $(SDL_INCLUDE) $(ESD_INCLUDE)
+		$(GTK_INCLUDE) $(SDL_INCLUDE)
 
-LOCAL_LIBRARIES= $(XLIB) $(PTHREAD_LIB) $(GTK_LIB) $(SDL_LIB) $(ESD_LIB)
+LOCAL_LIBRARIES= $(XLIB) $(GTK_LIB) $(SDL_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 \
@@ -190,7 +155,7 @@ VRAMOBJS=	../vram/vram.o ../vram/scrndra
 		../vram/makegrex.o
 
 X11OBJS=	dosio.o ini.o trace.o \
-		toolkit.o kdispwin.o skbdwin.o \
+		kdispwin.o skbdwin.o \
 		cmmidi.o cmserial.o \
 		drawmng.o kbdmng.o \
 		commng.o joymng.o soundmng.o sysmng.o taskmng.o timemng.o \
@@ -198,10 +163,6 @@ X11OBJS=	dosio.o ini.o trace.o \
 
 DEBUGOBJS=	debug/viewmem.o
 
-SNDDRVOBJS=	snddrv/esd.o snddrv/netbsd.o snddrv/oss.o snddrv/sdl.o
-
-JOYDRVOBJS=	joydrv/sdl.o
-
 #if defined(CPUCORE_IA32)
 
 CPUOBJS= \
@@ -261,7 +222,7 @@ OBJS=		$(COMMONOBJS) $(CODECNVOBJS) \
 		$(IOOBJS) $(LIOOBJS) $(NP2OBJS) $(SOUNDOBJS) $(GETSNDOBJS) \
 		$(VERMOUTHOBJS) $(VRAMOBJS) $(GENERICOBJS) \
 		$(CPUOBJS) $(MEMOBJS) \
-		$(X11OBJS) $(DEBUGOBJS) $(SNDDRVOBJS) $(JOYDRVOBJS) \
+		$(X11OBJS) $(DEBUGOBJS) \
 		$(GTKDEPOBJS)
 
 CSRCS=		$(COMMONOBJS:.o=.c) $(CODECNVOBJS:.o=.c) \
@@ -271,7 +232,7 @@ CSRCS=		$(COMMONOBJS:.o=.c) $(CODECNVOBJ
 		$(SOUNDOBJS:.o=.c) $(GETSNDOBJS:.o=.c) $(VERMOUTHOBJS:.o=.c) \
 		$(VRAMOBJS:.o=.c) $(GENERICOBJS:.o=.c) \
 		$(CPUOBJS:.o=.c) $(MEMOBJS:.o=.c) \
-		$(DEBUGOBJS:.o=.c) $(SNDDRVOBJS:.o=.c) $(JOYDRVOBJS:.o=.c) \
+		$(DEBUGOBJS:.o=.c) \
 		$(X11OBJS:.o=.c) $(GTKDEPOBJS:.o=.c)
 SRCS=		$(CSRCS)
 ALLSRCS=	$(ASRCS) $(CSRCS)
@@ -281,13 +242,13 @@ ALLSRCS=	$(ASRCS) $(CSRCS)
 
 ComplexProgramTarget(xnp2)
 
-InstallMultipleFlags(resources/fddseek.wav, $(SYSRESPATH)/wav, $(INSTDATFLAGS))
-InstallMultipleFlags(resources/fddseek1.wav, $(SYSRESPATH)/wav, $(INSTDATFLAGS))
+InstallMultipleFlags(resources/fddseek.wav, $(SYSRESPATH), $(INSTDATFLAGS))
+InstallMultipleFlags(resources/fddseek1.wav, $(SYSRESPATH), $(INSTDATFLAGS))
 
 XCOMM
 XCOMM for Release
 XCOMM
-XCOMM InstallMultipleFlags(../np2tool/np2tool.d88, $(SYSRESPATH)/fd, $(INSTDATFLAGS))
+XCOMM InstallMultipleFlags(../np2tool/np2tool.d88, $(SYSRESPATH), $(INSTDATFLAGS))
 
 clean::
 	$(RM) $(OBJS)