--- np2/x11/Attic/Imakefile 2004/01/26 15:20:05 1.12 +++ np2/x11/Attic/Imakefile 2004/07/15 14:24:33 1.24 @@ -18,8 +18,31 @@ XCOMM XCOMM GUI Toolkit XCOMM +#if defined(USE_GTK2) +GTK_CONFIG?= pkg-config gtk+-2.0 +CFLAGS+= -DGTK_DISABLE_DEPRECATED +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 +#else GTK_CONFIG?= gtk-config 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 GTK_INCLUDE= `$(GTK_CONFIG) --cflags` GTK_LIB= `$(GTK_CONFIG) --libs` @@ -76,7 +99,9 @@ SYS_LIBRARIES= -lm EXTRA_INCLUDES= -I. -I.. -I./debug -I../common \ -I../bios -I../cbus -I../fdd -I../font -I../generic \ - -I../io -I../lio -I../sound -I../sound/vermouth -I../vram \ + -I../io -I../lio \ + -I../sound -I../sound/vermouth -I../sound/getsnd \ + -I../vram \ $(PTHREAD_INCLUDE) $(GTK_INCLUDE) $(SDL_INCLUDE) $(ESD_INCLUDE) LOCAL_LIBRARIES= $(XLIB) $(PTHREAD_LIB) $(GTK_LIB) $(SDL_LIB) $(ESD_LIB) @@ -84,74 +109,23 @@ LOCAL_LIBRARIES= $(XLIB) $(PTHREAD_LIB) #define PassCDebugFlags -#if defined(CPUCORE_IA32) - -CPUOBJS= \ - ../i386c/cpucore.o \ - ../i386c/dmap.o \ - ../i386c/egcmem.o \ - ../i386c/memory.o \ - ../i386c/ia32/interface.o \ - ../i386c/ia32/ia32.o \ - ../i386c/ia32/cpu.o \ - ../i386c/ia32/cpu_io.o \ - ../i386c/ia32/cpu_mem.o \ - ../i386c/ia32/ctrlxfer.o \ - ../i386c/ia32/debug.o \ - ../i386c/ia32/disasm.o \ - ../i386c/ia32/exception.o \ - ../i386c/ia32/groups.o \ - ../i386c/ia32/inst_table.o \ - ../i386c/ia32/paging.o \ - ../i386c/ia32/resolve.o \ - ../i386c/ia32/segments.o \ - ../i386c/ia32/task.o \ - ../i386c/ia32/instructions/bin_arith.o \ - ../i386c/ia32/instructions/bit_byte.o \ - ../i386c/ia32/instructions/ctrl_trans.o \ - ../i386c/ia32/instructions/data_trans.o \ - ../i386c/ia32/instructions/dec_arith.o \ - ../i386c/ia32/instructions/flag_ctrl.o \ - ../i386c/ia32/instructions/logic_arith.o \ - ../i386c/ia32/instructions/misc_inst.o \ - ../i386c/ia32/instructions/seg_reg.o \ - ../i386c/ia32/instructions/shift_rotate.o \ - ../i386c/ia32/instructions/string_inst.o \ - ../i386c/ia32/instructions/system_inst.o \ - ../i386c/ia32/instructions/fpu/fpdummy.o - -CPUFLAGS= -DCPUCORE_IA32 \ - -I../i386c -I../i386c/ia32 \ - -I../i386c/ia32/instructions -I../i386c/ia32/instructions/fpu - -#else - -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/v30patch.o - -CPUFLAGS= -I../i286c - -#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 -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 \ +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 \ @@ -159,10 +133,11 @@ FDDOBJS= ../fdd/diskdrv.o ../fdd/newdisk 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 \ + ../font/fontfm7.o ../font/fontx1.o ../font/fontx68k.o GENERICOBJS= ../generic/cmndraw.o ../generic/keydisp.o ../generic/cmjasts.o \ - ../generic/hostdrv.o ../generic/hostdrvs.o + ../generic/hostdrv.o ../generic/hostdrvs.o ../generic/unasm.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 \ @@ -170,14 +145,13 @@ 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 NP2OBJS= ../pccore.o ../nevent.o ../calendar.o ../timing.o \ - ../debugsub.o ../statsave.o + ../statsave.o ../keystat.o SOUNDOBJS= ../sound/sound.o ../sound/soundrom.o ../sound/s98.o \ ../sound/adpcmc.o ../sound/adpcmg.o \ @@ -187,10 +161,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 \ @@ -202,24 +174,75 @@ VERMOUTHOBJS= ../sound/vermouth/midiout. VRAMOBJS= ../vram/vram.o ../vram/scrndraw.o ../vram/sdraw.o \ ../vram/dispsync.o ../vram/palettes.o ../vram/maketext.o \ - ../vram/maketgrp.o ../vram/makegrph.o ../vram/scrnbmp.o + ../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/unasm.o debug/viewmem.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 \ + ../i386c/ia32/cpu_io.o \ + ../i386c/ia32/cpu_mem.o \ + ../i386c/ia32/ctrlxfer.o \ + ../i386c/ia32/debug.o \ + ../i386c/ia32/disasm.o \ + ../i386c/ia32/exception.o \ + ../i386c/ia32/groups.o \ + ../i386c/ia32/inst_table.o \ + ../i386c/ia32/paging.o \ + ../i386c/ia32/resolve.o \ + ../i386c/ia32/segments.o \ + ../i386c/ia32/task.o \ + ../i386c/ia32/instructions/bin_arith.o \ + ../i386c/ia32/instructions/bit_byte.o \ + ../i386c/ia32/instructions/ctrl_trans.o \ + ../i386c/ia32/instructions/data_trans.o \ + ../i386c/ia32/instructions/dec_arith.o \ + ../i386c/ia32/instructions/flag_ctrl.o \ + ../i386c/ia32/instructions/logic_arith.o \ + ../i386c/ia32/instructions/misc_inst.o \ + ../i386c/ia32/instructions/seg_reg.o \ + ../i386c/ia32/instructions/shift_rotate.o \ + ../i386c/ia32/instructions/string_inst.o \ + ../i386c/ia32/instructions/system_inst.o \ + ../i386c/ia32/instructions/fpu/fpdummy.o + +CPUFLAGS= -DCPUCORE_IA32 \ + -I../i386c -I../i386c/ia32 \ + -I../i386c/ia32/instructions -I../i386c/ia32/instructions/fpu + +NP2OBJS+= ../debugsub386.o + +#else + +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/v30patch.o + +CPUFLAGS= -I../i286c + +NP2OBJS+= ../debugsub.o + +#endif OBJS= $(COMMONOBJS) $(BIOSOBJS) $(CBUSOBJS) $(FDDOBJS) $(FONTOBJS) \ $(IOOBJS) $(LIOOBJS) $(NP2OBJS) $(SOUNDOBJS) $(GETSNDOBJS) \ @@ -245,6 +268,11 @@ ComplexProgramTarget(xnp2) InstallMultipleFlags(resources/fddseek.wav, $(SYSRESPATH)/wav, $(INSTDATFLAGS)) InstallMultipleFlags(resources/fddseek1.wav, $(SYSRESPATH)/wav, $(INSTDATFLAGS)) +XCOMM +XCOMM for Release +XCOMM +XCOMM InstallMultipleFlags(../np2tool/np2tool.d88, $(SYSRESPATH)/fd, $(INSTDATFLAGS)) + clean:: $(RM) $(OBJS)