--- np2/win9x/Makefile 2005/05/26 16:36:16 1.31 +++ np2/win9x/Makefile 2011/02/17 10:36:05 1.35 @@ -1,8 +1,7 @@ # makefile for cygwin -# gcc version 3.3.3 +# gcc version 4.3.4 - -AS = nasmw +AS = nasm CC = gcc RC = windres RM = rm -f @@ -29,6 +28,7 @@ FDD = ../fdd LIO = ../lio FONT = ../font GENERIC = ../generic +ZLIB = ../zlib TARGET = . X86ASM = ./x86 DIALOG = ./dialog @@ -38,6 +38,8 @@ I286CASM = $(I286C)/x86 IOASM = $(IO)/x86 VRAMASM = $(VRAM)/x86 +RESDIR = ./resources/1252 + HEADERS = $(TARGET)/compiler.h $(BASE)/common.h $(COMMON)/milstr.h \ $(COMMON)/_memory.h $(COMMON)/rect.h $(COMMON)/lstarray.h \ $(TARGET)/trace.h @@ -62,28 +64,40 @@ VERMOUTHS = $(VERMOUTH)/midiout.h $(VERM $(VERMOUTH)/midinst.h $(VERMOUTH)/midvoice.h \ $(VERMOUTH)/midtable.h +ZLIBS = $(ZLIB)/crc32.h $(ZLIB)/inffast.h $(ZLIB)/inffixed.h \ + $(ZLIB)/inflate.h $(ZLIB)/inftrees.h $(ZLIB)/zconf.h \ + $(ZLIB)/zlib.h $(ZLIB)/zutil.h + + AOPT = -f win32 COPT = -c -Wall -pipe -O6 -fomit-frame-pointer -fkeep-inline-functions \ - -fsigned-char -mno-cygwin -march=pentium \ + -fsigned-char -mwindows -march=pentium \ -DWIN32 -DNDEBUG -D_WINDOWS \ -I$(BASE) -I$(COMMON) -I$(CODECNV) -I$(I286C) -I$(MEM) -I$(IO) \ -I$(CBUS) -I$(BIOS) -I$(LIO) -I$(VRAM) -I$(SOUND) -I$(VERMOUTH) \ -I$(GETSND) -I$(FDD) -I$(FONT) -I$(GENERIC) -I$(TARGET) \ - -I$(DIALOG) -I$(DEBUGUTY) -I$(X86ASM) -LOPT = -mno-cygwin -lstdc++ + -I$(DIALOG) -I$(DEBUGUTY) -I$(X86ASM) -I$(ZLIB) +LOPT = -mwindows -lstdc++ NP2OBJ = $(OBJ)/strres.o $(OBJ)/milstr.o $(OBJ)/_memory.o \ $(OBJ)/textfile.o $(OBJ)/profile.o $(OBJ)/rect.o \ $(OBJ)/lstarray.o $(OBJ)/bmpdata.o $(OBJ)/mimpidef.o \ - $(OBJ)/parts.oa \ + $(OBJ)/parts.oa $(OBJ)/arc.o $(OBJ)/arcunzip.o \ + \ + $(OBJ)/adler32.o $(OBJ)/crc32.o $(OBJ)/inffast.o \ + $(OBJ)/inflate.o $(OBJ)/inftrees.o $(OBJ)/zutil.o \ + \ $(OBJ)/utf8ucs2.o $(OBJ)/ucs2utf8.o $(OBJ)/tcswap16.o \ + \ $(OBJ)/i286c.o $(OBJ)/i286c_mn.o $(OBJ)/i286c_ea.o \ $(OBJ)/i286c_0f.o $(OBJ)/i286c_8x.o $(OBJ)/i286c_sf.o \ $(OBJ)/i286c_f6.o $(OBJ)/i286c_fe.o $(OBJ)/i286c_rp.o \ $(OBJ)/v30patch.o $(OBJ)/memory.o \ + \ $(OBJ)/dmax86.o $(OBJ)/dmav30.o $(OBJ)/memtram.o \ $(OBJ)/memvram.o $(OBJ)/memegc.o $(OBJ)/memems.o \ $(OBJ)/memepp.o \ + \ $(OBJ)/iocore.o $(OBJ)/artic.o $(OBJ)/cgrom.o \ $(OBJ)/cpuio.o $(OBJ)/crtc.o $(OBJ)/dipsw.o \ $(OBJ)/dmac.o $(OBJ)/egc.o $(OBJ)/emsio.o \ @@ -93,11 +107,13 @@ NP2OBJ = $(OBJ)/strres.o $(OBJ)/milstr. $(OBJ)/np2sysp.o $(OBJ)/pic.o $(OBJ)/pit.o \ $(OBJ)/printif.o $(OBJ)/serial.o $(OBJ)/sysport.o \ $(OBJ)/upd4990.o \ + \ $(OBJ)/cbuscore.o $(OBJ)/sasiio.o $(OBJ)/scsiio.o \ $(OBJ)/scsicmd.o $(OBJ)/pc9861k.o $(OBJ)/mpu98ii.o \ $(OBJ)/board14.o $(OBJ)/board26k.o $(OBJ)/board86.o \ $(OBJ)/boardx2.o $(OBJ)/board118.o $(OBJ)/boardspb.o \ $(OBJ)/amd98.o $(OBJ)/pcm86io.o $(OBJ)/cs4231io.o \ + \ $(OBJ)/bios.o $(OBJ)/bios09.o $(OBJ)/bios0c.o \ $(OBJ)/bios12.o $(OBJ)/bios13.o $(OBJ)/bios18.o \ $(OBJ)/bios19.o $(OBJ)/bios1a.o $(OBJ)/bios1b.o \ @@ -107,6 +123,7 @@ NP2OBJ = $(OBJ)/strres.o $(OBJ)/milstr. $(OBJ)/vram.o $(OBJ)/scrndraw.o $(OBJ)/sdraw.o \ $(OBJ)/dispsync.o $(OBJ)/palettes.o $(OBJ)/maketext.o \ $(OBJ)/maketgrp.o $(OBJ)/makegrph.oa $(OBJ)/scrnsave.o \ + \ $(OBJ)/sound.o $(OBJ)/sndcsec.o $(OBJ)/fmboard.o \ $(OBJ)/fmtimer.o $(OBJ)/beepc.o $(OBJ)/beepg.o \ $(OBJ)/tms3631c.o $(OBJ)/tms3631g.o $(OBJ)/opngenc.o \ @@ -114,18 +131,24 @@ NP2OBJ = $(OBJ)/strres.o $(OBJ)/milstr. $(OBJ)/rhythmc.o $(OBJ)/adpcmc.o $(OBJ)/adpcmg.o \ $(OBJ)/pcm86c.o $(OBJ)/pcm86g.o $(OBJ)/cs4231c.o \ $(OBJ)/cs4231g.o $(OBJ)/soundrom.o $(OBJ)/s98.o \ + \ $(OBJ)/getsnd.o $(OBJ)/getwave.o $(OBJ)/getsmix.o \ + \ $(OBJ)/midiout.o $(OBJ)/midimod.o $(OBJ)/midinst.o \ $(OBJ)/midvoice.o $(OBJ)/midtable.o \ + \ $(OBJ)/diskdrv.o $(OBJ)/newdisk.o $(OBJ)/fddfile.o \ $(OBJ)/fdd_xdf.o $(OBJ)/fdd_d88.o $(OBJ)/fdd_mtr.o \ $(OBJ)/sxsi.o $(OBJ)/sxsihdd.o $(OBJ)/sxsicd.o \ + \ $(OBJ)/font.o $(OBJ)/fontdata.o $(OBJ)/fontpc88.o \ $(OBJ)/fontpc98.o $(OBJ)/fontv98.o $(OBJ)/fontfm7.o \ $(OBJ)/fontx1.o $(OBJ)/fontx68k.o $(OBJ)/fontmake.o \ + \ $(OBJ)/cmndraw.o $(OBJ)/keydisp.o $(OBJ)/softkbd.o \ $(OBJ)/dipswbmp.o $(OBJ)/cmjasts.o $(OBJ)/hostdrv.o \ $(OBJ)/hostdrvs.o $(OBJ)/unasm.o $(OBJ)/np2info.o \ + \ $(OBJ)/np2.o $(OBJ)/np2arg.o $(OBJ)/cputype.oa \ $(OBJ)/oemtext.o $(OBJ)/dosio.o $(OBJ)/extromio.o \ $(OBJ)/trace.o $(OBJ)/winloc.o $(OBJ)/commng.o \ @@ -136,14 +159,18 @@ NP2OBJ = $(OBJ)/strres.o $(OBJ)/milstr. $(OBJ)/sstp.o $(OBJ)/sstpmsg.o $(OBJ)/winkbd.o \ $(OBJ)/dclock.o $(OBJ)/dclockd.o $(OBJ)/menu.o \ $(OBJ)/ini.o $(OBJ)/dd2.o $(OBJ)/toolwin.o \ - $(OBJ)/subwind.o $(OBJ)/mt32snd.o $(OBJ)/np2res.o \ + $(OBJ)/subwind.o $(OBJ)/mt32snd.o $(OBJ)/win32sub.o \ + $(OBJ)/np2res.o \ + \ $(OBJ)/np2class.o $(OBJ)/d_about.o $(OBJ)/d_config.o \ $(OBJ)/d_mpu98.o $(OBJ)/d_screen.o $(OBJ)/d_serial.o \ $(OBJ)/d_sound.o $(OBJ)/d_clnd.o $(OBJ)/d_disk.o \ $(OBJ)/d_bmp.o $(OBJ)/dialogs.o \ + \ $(OBJ)/viewer.o $(OBJ)/viewcmn.o $(OBJ)/viewmenu.o \ $(OBJ)/viewmem.o $(OBJ)/viewreg.o $(OBJ)/viewseg.o \ $(OBJ)/view1mb.o $(OBJ)/viewasm.o $(OBJ)/viewsnd.o \ + \ $(OBJ)/pccore.o $(OBJ)/nevent.o $(OBJ)/calendar.o \ $(OBJ)/timing.o $(OBJ)/keystat.o $(OBJ)/statsave.o \ $(OBJ)/debugsub.o @@ -210,6 +237,34 @@ $(OBJ)/parts.o : $(COMMON)/parts.c $(HE $(OBJ)/parts.oa : $(X86ASM)/parts.x86 $(AS) $(AOPT) $< -o $@ +$(OBJ)/arc.o : $(COMMON)/arc.c $(HEADERS) $(TARGET)/dosio.h \ + $(COMMON)/arc.h $(COMMON)/arcunzip.h + $(CC) $(COPT) -o $@ $< + +$(OBJ)/arcunzip.o : $(COMMON)/arcunzip.c $(HEADERS) $(TARGET)/dosio.h \ + $(COMMON)/arc.h $(COMMON)/arcunzip.h $(ZLIBS) + $(CC) $(COPT) -o $@ $< + + + +$(OBJ)/adler32.o : $(ZLIB)/adler32.c $(ZLIBS) + $(CC) $(COPT) -o $@ $< + +$(OBJ)/crc32.o : $(ZLIB)/crc32.c $(ZLIBS) + $(CC) $(COPT) -o $@ $< + +$(OBJ)/inffast.o : $(ZLIB)/inffast.c $(ZLIBS) + $(CC) $(COPT) -o $@ $< + +$(OBJ)/inflate.o : $(ZLIB)/inflate.c $(ZLIBS) + $(CC) $(COPT) -o $@ $< + +$(OBJ)/inftrees.o : $(ZLIB)/inftrees.c $(ZLIBS) + $(CC) $(COPT) -o $@ $< + +$(OBJ)/zutil.o : $(ZLIB)/zutil.c $(ZLIBS) + $(CC) $(COPT) -o $@ $< + $(OBJ)/utf8ucs2.o : $(CODECNV)/utf8ucs2.c $(HEADERS) $(CODECNV)/textcnv.h @@ -1062,8 +1117,12 @@ $(OBJ)/mt32snd.o : $(TARGET)/mt32snd.cpp $(TARGET)/mt32snd.h $(CC) $(COPT) -o $@ $< -$(OBJ)/np2res.o : $(TARGET)/np2res.rc $(TARGET)/resource.h - $(RC) -i $< -o $@ +$(OBJ)/win32sub.o : $(TARGET)/win32sub.cpp $(HEADERS) \ + $(TARGET)/win32sub.h + $(CC) $(COPT) -o $@ $< + +$(OBJ)/np2res.o : $(RESDIR)/np2.rc $(TARGET)/resource.h + $(RC) -I$(RESDIR) -i $< -o $@