--- np2/x11/Attic/Imakefile 2004/03/10 16:33:57 1.17 +++ np2/x11/Attic/Imakefile 2007/01/23 15:48:20 1.32 @@ -1,5 +1,7 @@ +XCOMM $Id: Imakefile,v 1.32 2007/01/23 15:48:20 monaka Exp $ + XCOMM -XCOMM read config +XCOMM user config XCOMM #include "config.tmpl" @@ -18,27 +20,24 @@ XCOMM XCOMM GUI Toolkit XCOMM -GTK_CONFIG?= gtk-config -GTK_DEFINE= -DUSE_GTK=1 +GTK_CONFIG?= pkg-config gtk+-2.0 GTK_INCLUDE= `$(GTK_CONFIG) --cflags` GTK_LIB= `$(GTK_CONFIG) --libs` +GTK_DEFINE= -DUSE_GTK2=1 + +GTKDEPOBJS= gtk2/dialog_about.o gtk2/dialog_calendar.o \ + gtk2/dialog_config.o gtk2/dialog_midi.o gtk2/dialog_newdisk.o \ + gtk2/dialog_screen.o gtk2/dialog_sound.o \ + gtk2/window_keydisp.o gtk2/window_softkbd.o \ + 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 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 @@ -50,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 @@ -74,38 +61,48 @@ DEFINES= ShmDefines \ SYS_LIBRARIES= -lm -EXTRA_INCLUDES= -I. -I.. -I./debug -I../common \ +EXTRA_INCLUDES= -I. -I.. -I./debug -I../common -I../codecnv \ -I../bios -I../cbus -I../fdd -I../font -I../generic \ - -I../io -I../lio \ + -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 \ ../common/lstarray.o ../common/bmpdata.o ../common/mimpidef.o \ - ../common/codecnv.o ../common/parts.o ../common/wavefile.o + ../common/parts.o ../common/wavefile.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 \ +CODECNVOBJS= ../codecnv/eucsjis.o ../codecnv/eucucs2.o \ + ../codecnv/sjiseuc.o ../codecnv/sjisucs2.o \ + ../codecnv/ucs2utf8.o ../codecnv/utf8ucs2.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/bios1f.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/sasiio.o ../cbus/scsiio.o ../cbus/scsicmd.o + ../cbus/sasiio.o ../cbus/scsiio.o ../cbus/scsicmd.o \ + ../cbus/ideio.o ../cbus/atapicmd.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 + ../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 \ @@ -113,7 +110,7 @@ FONTOBJS= ../font/font.o ../font/fontdat GENERICOBJS= ../generic/cmndraw.o ../generic/keydisp.o ../generic/cmjasts.o \ ../generic/hostdrv.o ../generic/hostdrvs.o ../generic/unasm.o \ - ../generic/np2info.o + ../generic/np2info.o ../generic/memdbg32.o ../generic/softkbd.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 \ @@ -121,11 +118,14 @@ IOOBJS= ../io/iocore.o ../io/artic.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/necio.o ../io/epsonio.o + ../io/necio.o ../io/epsonio.o ../io/pcidev.o -LIOOBJS= ../lio/lio.o ../lio/gscreen.o ../lio/gview.o ../lio/gcolor1.o \ - ../lio/gcolor2.o ../lio/gcls.o ../lio/gpset.o ../lio/gline.o \ - ../lio/gput1.o +LIOOBJS= ../lio/lio.o ../lio/gscreen.o ../lio/gpset.o ../lio/gline.o \ + ../lio/gcircle.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 \ ../statsave.o ../keystat.o @@ -138,10 +138,8 @@ SOUNDOBJS= ../sound/sound.o ../sound/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 \ @@ -156,31 +154,20 @@ 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 toolkit.o cmmidi.o kdispwin.o \ +X11OBJS= dosio.o ini.o trace.o \ + toolkit.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 \ main.o np2.o DEBUGOBJS= debug/viewmem.o -SNDDRVOBJS= snddrv/esd.o snddrv/netbsd.o snddrv/oss.o snddrv/sdl.o - -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_keydisp.o gtk/window_viewer.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 - #if defined(CPUCORE_IA32) CPUOBJS= \ ../i386c/cpucore.o \ - ../i386c/dmap.o \ - ../i386c/egcmem.o \ ../i386c/memory.o \ - ../i386c/mem9821.o \ ../i386c/ia32/interface.o \ ../i386c/ia32/ia32.o \ ../i386c/ia32/cpu.o \ @@ -221,7 +208,7 @@ NP2OBJS+= ../debugsub386.o CPUOBJS= ../i286c/i286c.o ../i286c/i286c_mn.o ../i286c/i286c_ea.o \ ../i286c/i286c_0f.o ../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 CPUFLAGS= -I../i286c @@ -230,19 +217,23 @@ NP2OBJS+= ../debugsub.o #endif -OBJS= $(COMMONOBJS) $(BIOSOBJS) $(CBUSOBJS) $(FDDOBJS) $(FONTOBJS) \ +OBJS= $(COMMONOBJS) $(CODECNVOBJS) \ + $(BIOSOBJS) $(CBUSOBJS) $(FDDOBJS) $(FONTOBJS) \ $(IOOBJS) $(LIOOBJS) $(NP2OBJS) $(SOUNDOBJS) $(GETSNDOBJS) \ - $(VERMOUTHOBJS) $(VRAMOBJS) $(GENERICOBJS) $(CPUOBJS) \ - $(X11OBJS) $(DEBUGOBJS) $(SNDDRVOBJS) $(GTKDEPOBJS) + $(VERMOUTHOBJS) $(VRAMOBJS) $(GENERICOBJS) \ + $(CPUOBJS) $(MEMOBJS) \ + $(X11OBJS) $(DEBUGOBJS) \ + $(GTKDEPOBJS) -CSRCS= $(COMMONOBJS:.o=.c) $(BIOSOBJS:.o=.c) $(CBUSOBJS:.o=.c) \ +CSRCS= $(COMMONOBJS:.o=.c) $(CODECNVOBJS:.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) $(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) + $(CPUOBJS:.o=.c) $(MEMOBJS:.o=.c) \ + $(DEBUGOBJS:.o=.c) \ + $(X11OBJS:.o=.c) $(GTKDEPOBJS:.o=.c) SRCS= $(CSRCS) ALLSRCS= $(ASRCS) $(CSRCS) @@ -251,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)