Updated makefiles. Minor src cleanup.

This commit is contained in:
jbo_85
2005-08-14 13:49:35 +00:00
parent 2bb532fd04
commit f3d316cbe0
5 changed files with 271 additions and 242 deletions

View File

@@ -135,140 +135,146 @@ sec-test: ${TOOLSOBJ}
srccount: ${TOOLSOBJ} srccount: ${TOOLSOBJ}
@CXX@ @CFLAGS@ -o ${TOOLSDIR}/srccount ${TOOLSDIR}/srccount.cpp ${TOOLSDIR}/fileutil.o @CXX@ @CFLAGS@ -o ${TOOLSDIR}/srccount ${TOOLSDIR}/srccount.cpp ${TOOLSDIR}/fileutil.o
cfgload.o: cfgload.c macros.mac cfgload.o: cfgload.c gblhdr.h
cfgparse.o: cfgparse.psr cfgparse.o: cfgparse.psr
debug.o: debug.c gblhdr.h gblvars.h
endmem.o: endmem.asm macros.mac endmem.o: endmem.asm macros.mac
init.o: init.asm macros.mac init.o: init.asm macros.mac
initc.o: initc.c ${CPUDIR}/memtable.h ${JMADIR}/zsnesjma.h initc.o: initc.c asm_call.h gblhdr.h ${CPUDIR}/memtable.h ${JMADIR}/zsnesjma.h\
patch.o: patch.c ${ZIPDIR}/zunzip.h
patch.o: patch.c gblhdr.h ${ZIPDIR}/zunzip.h
ui.o: ui.asm macros.mac ui.o: ui.asm macros.mac
uic.o: uic.c uic.o: uic.c asm_call.h gblhdr.h
vcache.o: vcache.asm macros.mac vcache.o: vcache.asm macros.mac
version.o: version.c version.o: version.c
zloader.o: zloader.c zloader.o: zloader.c gblhdr.h
zmovie.o: zmovie.c zmovie.o: zmovie.c asm_call.h gblhdr.h gblvars.h numconv.h
zstate.o: zstate.c zstate.o: zstate.c asm_call.h gblhdr.h gblvars.h numconv.h
${CHIPDIR}/c4emu.o: ${CHIPDIR}/c4emu.c gblhdr.h
${CHIPDIR}/dsp1emu.o: ${CHIPDIR}/dsp1emu.c gblhdr.h
${CHIPDIR}/dsp1proc.o: ${CHIPDIR}/dsp1proc.asm macros.mac ${CHIPDIR}/dsp1proc.o: ${CHIPDIR}/dsp1proc.asm macros.mac
${CHIPDIR}/dsp2proc.o: ${CHIPDIR}/dsp2proc.asm macros.mac
${CHIPDIR}/dsp4emu.o: ${CHIPDIR}/dsp4emu.c
${CHIPDIR}/dsp4proc.o: ${CHIPDIR}/dsp4proc.asm macros.mac
${CHIPDIR}/fxemu2.o: ${CHIPDIR}/fxemu2.asm macros.mac ${CHIPDIR}/fxemu2.mac
${CHIPDIR}/fxemu2b.o: ${CHIPDIR}/fxemu2b.asm macros.mac ${CHIPDIR}/fxemu2.mac\
${CHIPDIR}/fxemu2b.mac
${CHIPDIR}/fxemu2c.o: ${CHIPDIR}/fxemu2c.asm macros.mac ${CHIPDIR}/fxemu2.mac\
${CHIPDIR}/fxemu2c.mac
${CHIPDIR}/fxtable.o: ${CHIPDIR}/fxtable.asm macros.mac
${CHIPDIR}/sa1proc.o: ${CHIPDIR}/sa1proc.asm macros.mac
${CHIPDIR}/sa1regs.o: ${CHIPDIR}/sa1regs.asm macros.mac\ ${CHIPDIR}/sa1regs.o: ${CHIPDIR}/sa1regs.asm macros.mac\
${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac
${CHIPDIR}/sdd1emu.o: ${CHIPDIR}/sdd1emu.c
${CHIPDIR}/seta10.o: ${CHIPDIR}/seta10.c gblhdr.h
${CHIPDIR}/sfxproc.o: ${CHIPDIR}/sfxproc.asm macros.mac\ ${CHIPDIR}/sfxproc.o: ${CHIPDIR}/sfxproc.asm macros.mac\
${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac
${CHIPDIR}/st10proc.o: ${CHIPDIR}/st10proc.asm macros.mac ${CHIPDIR}/st10proc.o: ${CHIPDIR}/st10proc.asm macros.mac
${CHIPDIR}/seta10.o: ${CHIPDIR}/seta10.c
${CHIPDIR}/dsp1emu.o: ${CHIPDIR}/dsp1emu.c
${CHIPDIR}/dsp4proc.o: ${CHIPDIR}/dsp4proc.asm macros.mac
${CHIPDIR}/dsp4emu.o: ${CHIPDIR}/dsp4emu.c
${CHIPDIR}/fxemu2.o: ${CHIPDIR}/fxemu2.asm ${CHIPDIR}/fxemu2.mac\
macros.mac
${CHIPSDIR}/fxemu2b.o: ${CHIPDIR}/fxemu2b.asm ${CHIPDIR}/fxemu2.mac\
${CHIPDIR}/fxemu2b.mac
${CHIPSDIR}/fxemu2c.o: ${CHIPDIR}/fxemu2c.asm macros.mac ${CHIPDIR}/fxemu2.mac\
${CHIPDIR}/fxemu2b.mac ${CHIPDIR}/fxemu2c.mac
${CHIPDIR}/fxtable.o: ${CHIPDIR}/fxtable.asm macros.mac
${CHIPDIR}/sa1proc.o: ${CHIPDIR}/sa1proc.asm macros.mac
${CPUDIR}/execute.o: ${CPUDIR}/execute.asm macros.mac
${CPUDIR}/table.o: ${CPUDIR}/table.asm ${CPUDIR}/65816d.inc\
${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816.inc\
${CPUDIR}/regs.mac ${CPUDIR}/regs.inc ${CPUDIR}/regsw.mac\
${CPUDIR}/regsw.inc macros.mac
${CPUDIR}/tableb.o: ${CPUDIR}/tableb.asm ${CPUDIR}/65816db.inc\
${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816b.inc\
${CPUDIR}/regs.mac macros.mac
${CPUDIR}/tablec.o: ${CPUDIR}/tablec.asm ${CPUDIR}/65816dc.inc\
${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816c.inc\
${CPUDIR}/regs.mac macros.mac
${CPUDIR}/stable.o: ${CPUDIR}/stable.asm ${CPUDIR}/s65816d.inc\
${CPUDIR}/saddress.inc ${CPUDIR}/saddrni.inc ${CPUDIR}/se65816.inc\
macros.mac
${CPUDIR}/memory.o: ${CPUDIR}/memtable.h ${CPUDIR}/memory.asm macros.mac
${CPUDIR}/memtable.o: ${CPUDIR}/memtable.c
${CPUDIR}/executec.o: ${CPUDIR}/executec.c
${CPUDIR}/dma.o: ${CPUDIR}/dma.asm macros.mac ${CPUDIR}/dma.o: ${CPUDIR}/dma.asm macros.mac
${CPUDIR}/irq.o: ${CPUDIR}/irq.asm macros.mac
${CPUDIR}/dspproc.o: ${CPUDIR}/dspproc.asm macros.mac
${CPUDIR}/spc700.o:${CPUDIR}/spc700.asm macros.mac\
${CPUDIR}/regsw.mac ${CPUDIR}/spcdef.inc ${CPUDIR}/spcaddr.inc
${CPUDIR}/dsp.o: ${CPUDIR}/dsp.asm macros.mac ${CPUDIR}/dsp.o: ${CPUDIR}/dsp.asm macros.mac
${CPUDIR}/dspproc.o: ${CPUDIR}/dspproc.asm macros.mac ${CPUDIR}/fir_tables.inc
${CPUDIR}/execute.o: ${CPUDIR}/execute.asm macros.mac
${CPUDIR}/executec.o: ${CPUDIR}/executec.c gblhdr.h gblvars.h
${CPUDIR}/irq.o: ${CPUDIR}/irq.asm macros.mac
${CPUDIR}/memory.o: ${CPUDIR}/memory.asm macros.mac
${CPUDIR}/memtable.o: ${CPUDIR}/memtable.c gblhdr.h gblvars.h ${CPUDIR}/memtable.h
${CPUDIR}/spc700.o: ${CPUDIR}/spc700.asm macros.mac ${CPUDIR}/regsw.mac\
${CPUDIR}/spcaddr.inc ${CPUDIR}/spcdef.inc
${CPUDIR}/stable.o: ${CPUDIR}/stable.asm macros.mac ${CPUDIR}/s65816d.inc\
${CPUDIR}/saddress.inc ${CPUDIR}/saddrni.inc ${CPUDIR}/se65816.inc
${CPUDIR}/table.o: ${CPUDIR}/table.asm macros.mac ${CPUDIR}/65816d.inc\
${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816.inc\
${CPUDIR}/regs.inc ${CPUDIR}/regs.mac ${CPUDIR}/regsw.inc ${CPUDIR}/regsw.mac
${CPUDIR}/tableb.o: ${CPUDIR}/tableb.asm macros.mac ${CPUDIR}/65816db.inc\
${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816b.inc
${CPUDIR}/tablec.o: ${CPUDIR}/tablec.asm macros.mac ${CPUDIR}/65816dc.inc\
${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816c.inc
${DOSDIR}/debug.o: ${DOSDIR}/debug.asm macros.mac ${DOSDIR}/debug.o: ${DOSDIR}/debug.asm macros.mac
${DOSDIR}/dosintrf.o: ${DOSDIR}/dosintrf.asm macros.mac ${DOSDIR}/gppro.o: ${DOSDIR}/gppro.asm macros.mac
${DOSDIR}/initvid.o:${DOSDIR}/initvid.asm macros.mac ${DOSDIR}/initvid.o: ${DOSDIR}/initvid.asm macros.mac ${DOSDIR}/vga.inc
${DOSDIR}/vesa2.o: ${DOSDIR}/vesa2.asm macros.mac
${DOSDIR}/vesa12.o: ${DOSDIR}/vesa12.asm macros.mac
${DOSDIR}/joy.o: ${DOSDIR}/joy.asm macros.mac ${DOSDIR}/joy.o: ${DOSDIR}/joy.asm macros.mac
${DOSDIR}/sw.o: ${DOSDIR}/sw.asm macros.mac ${DOSDIR}/sw.o: ${DOSDIR}/sw.asm macros.mac
${DOSDIR}/gppro.o: ${DOSDIR}/gppro.asm macros.mac ${DOSDIR}/vesa12.o: ${DOSDIR}/vesa12.asm macros.mac
${DOSDIR}/zsipx.o: ${DOSDIR}/zsipx.asm ${DOSDIR}/vesa2.o: ${DOSDIR}/vesa2.asm macros.mac
${EFFECTSDIR}/water.o: ${EFFECTSDIR}/water.c ${EFFECTSDIR}/fixsin.h gblhdr.h
${EFFECTSDIR}/smoke.o: ${EFFECTSDIR}/smoke.c
${EFFECTSDIR}/burn.o: ${EFFECTSDIR}/burn.c ${EFFECTSDIR}/burn.o: ${EFFECTSDIR}/burn.c
${EFFECTSDIR}/smoke.o: ${EFFECTSDIR}/smoke.c
${EFFECTSDIR}/water.o: ${EFFECTSDIR}/water.c gblhdr.h ${EFFECTSDIR}/fixsin.h
${GUIDIR}/gui.o: ${GUIDIR}/gui.asm ${GUIDIR}/guitools.inc\ ${GUIDIR}/gui.o: ${GUIDIR}/gui.asm macros.mac ${GUIDIR}/guicheat.inc\
${GUIDIR}/guimisc.inc ${GUIDIR}/guimouse.inc ${GUIDIR}/guiwindp.inc\ ${GUIDIR}/guicombo.inc ${GUIDIR}/guikeys.inc ${GUIDIR}/guiload.inc\
${GUIDIR}/guikeys.inc ${GUIDIR}/guicheat.inc\ ${GUIDIR}/guimisc.inc ${GUIDIR}/guimouse.inc ${GUIDIR}/guitools.inc\
${GUIDIR}/guicombo.inc ${GUIDIR}/guiload.inc macros.mac ${GUIDIR}/guiwindp.inc
${GUIDIR}/guifuncs.o: ${GUIDIR}/guifuncs.c ${GUIDIR}/guifuncs.o: ${GUIDIR}/guifuncs.c gblhdr.h
${GUIDIR}/menu.o: ${GUIDIR}/menu.asm macros.mac ${GUIDIR}/menu.o: ${GUIDIR}/menu.asm macros.mac
${JMADIR}/7zlzma.o: ${JMADIR}/7zlzma.cpp ${JMADIR}/7z.h ${JMADIR}/iiostrm.h ${JMADIR}/7zlzma.o: ${JMADIR}/7zlzma.cpp ${JMADIR}/7z.h ${JMADIR}/lzmadec.h
${JMADIR}/crc32.o: ${JMADIR}/crc32.cpp ${JMADIR}/crc32.h ${JMADIR}/crc32.o: ${JMADIR}/crc32.cpp
${JMADIR}/iiostrm.o: ${JMADIR}/iiostrm.cpp ${JMADIR}/iiostrm.h ${JMADIR}/crc32.h ${JMADIR}/iiostrm.o: ${JMADIR}/iiostrm.cpp ${JMADIR}/crc32.h ${JMADIR}/iiostrm.h\
${JMADIR}/inbyte.o: ${JMADIR}/inbyte.cpp ${JMADIR}/portable.h
${JMADIR}/jma.o: ${JMADIR}/jma.cpp ${JMADIR}/jma.h ${JMADIR}/crc32.h ${JMADIR}/portable.h\ ${JMADIR}/inbyte.o: ${JMADIR}/inbyte.cpp ${JMADIR}/inbyte.h
${JMADIR}/7z.h ${JMADIR}/iiostrm.h ${JMADIR}/jma.o: ${JMADIR}/jma.cpp ${JMADIR}/7z.h ${JMADIR}/crc32.h\
${JMADIR}/lzma.o: ${JMADIR}/lzma.cpp ${JMADIR}/jma.h ${JMADIR}/portable.h
${JMADIR}/lzmadec.o: ${JMADIR}/lzmadec.cpp ${JMADIR}/lzma.o: ${JMADIR}/lzma.cpp ${JMADIR}/lzma.h
${JMADIR}/winout.o: ${JMADIR}/winout.cpp ${JMADIR}/iiostrm.h ${JMADIR}/lzmadec.o: ${JMADIR}/lzmadec.cpp ${JMADIR}/lzmadec.h\
${JMADIR}/zsnesjma.o: ${JMADIR}/zsnesjma.cpp ${JMADIR}/zsnesjma.h ${JMADIR}/jma.h ${JMADIR}/portable.h
${JMADIR}/winout.o: ${JMADIR}/winout.cpp ${JMADIR}/winout.h
${JMADIR}/zsnesjma.o: ${JMADIR}/zsnesjma.cpp ${JMADIR}/jma.h\
${JMADIR}/zsnesjma.h
${TOOLSDIR}/fileutil.o: ${TOOLSDIR}/fileutil.cpp ${TOOLSDIR}/fileutil.h ${TOOLSDIR}/fileutil.o: ${TOOLSDIR}/fileutil.cpp ${TOOLSDIR}/fileutil.h
${TOOLSDIR}/strutil.o: ${TOOLSDIR}/strutil.cpp ${TOOLSDIR}/strutil.h ${TOOLSDIR}/strutil.o: ${TOOLSDIR}/strutil.cpp ${TOOLSDIR}/strutil.h
${VIDEODIR}/procvid.o: ${VIDEODIR}/procvid.asm macros.mac ${VIDEODIR}/copyvid.inc ${VIDEODIR}/2xsaimmx.inc ${VIDEODIR}/2xsaiw.o: ${VIDEODIR}/2xsaiw.asm macros.mac
${VIDEODIR}/procvidc.o: ${VIDEODIR}/procvidc.c
${VIDEODIR}/sw_draw.o: ${VIDEODIR}/sw_draw.asm macros.mac
${VIDEODIR}/hq2x16.o: ${VIDEODIR}/hq2x16.asm macros.mac ${VIDEODIR}/hq2x16.o: ${VIDEODIR}/hq2x16.asm macros.mac
${VIDEODIR}/hq2x32.o: ${VIDEODIR}/hq2x32.asm macros.mac ${VIDEODIR}/hq2x32.o: ${VIDEODIR}/hq2x32.asm macros.mac
${VIDEODIR}/hq3x16.o: ${VIDEODIR}/hq3x16.asm macros.mac ${VIDEODIR}/hq3x16.o: ${VIDEODIR}/hq3x16.asm macros.mac
${VIDEODIR}/hq3x32.o: ${VIDEODIR}/hq3x32.asm macros.mac ${VIDEODIR}/hq3x32.o: ${VIDEODIR}/hq3x32.asm macros.mac
${VIDEODIR}/hq4x16.o: ${VIDEODIR}/hq4x16.asm macros.mac ${VIDEODIR}/hq4x16.o: ${VIDEODIR}/hq4x16.asm macros.mac
${VIDEODIR}/hq4x32.o: ${VIDEODIR}/hq4x32.asm macros.mac ${VIDEODIR}/hq4x32.o: ${VIDEODIR}/hq4x32.asm macros.mac
${VIDEODIR}/makevid.o: ${VIDEODIR}/makevid.asm ${VIDEODIR}/vidmacro.mac\ ${VIDEODIR}/m716text.o: ${VIDEODIR}/m716text.asm macros.mac
macros.mac ${VIDEODIR}/makev16b.o: ${VIDEODIR}/makev16b.asm macros.mac\
${VIDEODIR}/makev16b.o: ${VIDEODIR}/makev16b.asm ${VIDEODIR}/vidmacro.mac\ ${VIDEODIR}/vidmacro.mac
macros.mac ${VIDEODIR}/makev16t.o: ${VIDEODIR}/makev16t.asm macros.mac\
${VIDEODIR}/makev16t.o: ${VIDEODIR}/makev16t.asm ${VIDEODIR}/vidmacro.mac\ ${VIDEODIR}/vidmacro.mac
macros.mac ${VIDEODIR}/makevid.o: ${VIDEODIR}/makevid.asm macros.mac\
${VIDEODIR}/mv16tms.o: ${VIDEODIR}/mv16tms.asm ${VIDEODIR}/vidmacro.mac\ ${VIDEODIR}/vidmacro.mac
macros.mac ${VIDEODIR}/mode7.o: ${VIDEODIR}/mode7.asm macros.mac ${VIDEODIR}/mode7.mac
${VIDEODIR}/mode7.o: ${VIDEODIR}/mode7.asm ${VIDEODIR}/mode7.mac\ ${VIDEODIR}/mode716.o: ${VIDEODIR}/mode716.asm macros.mac ${VIDEODIR}/mode716.mac
macros.mac ${VIDEODIR}/mode716b.o: ${VIDEODIR}/mode716b.asm macros.mac ${VIDEODIR}/mode7.mac
${VIDEODIR}/mode716.o: ${VIDEODIR}/mode716.asm ${VIDEODIR}/mode716.mac\ ${VIDEODIR}/mode716d.o: ${VIDEODIR}/mode716d.asm macros.mac ${VIDEODIR}/mode7.mac
macros.mac ${VIDEODIR}/mode716e.o: ${VIDEODIR}/mode716e.asm macros.mac
${VIDEODIR}/mode716b.o:${VIDEODIR}/mode716b.asm ${VIDEODIR}/mode7.mac\ ${VIDEODIR}/mode716t.o: ${VIDEODIR}/mode716t.asm macros.mac ${VIDEODIR}/mode7.mac
macros.mac ${VIDEODIR}/mode7ext.o: ${VIDEODIR}/mode7ext.asm macros.mac ${VIDEODIR}/mode7.mac
${VIDEODIR}/mode716t.o:${VIDEODIR}/mode716t.asm ${VIDEODIR}/mode7.mac\ ${VIDEODIR}/mv16tms.o: ${VIDEODIR}/mv16tms.asm macros.mac\
macros.mac ${VIDEODIR}/vidmacro.mac
${VIDEODIR}/mode716d.o:${VIDEODIR}/mode716d.asm ${VIDEODIR}/mode7.mac\ ${VIDEODIR}/newg162.o: ${VIDEODIR}/newg162.asm macros.mac\
macros.mac ${VIDEODIR}/newg162.mac ${VIDEODIR}/newg16wn.mac ${VIDEODIR}/newgfx16.mac\
${VIDEODIR}/mode7ext.o:${VIDEODIR}/mode7ext.asm macros.mac ${VIDEODIR}/vidmacro.mac
${VIDEODIR}/mode716e.o:${VIDEODIR}/mode716e.asm macros.mac ${VIDEODIR}/newfgx.o: ${VIDEODIR}/newfgx.asm macros.mac ${VIDEODIR}/newgfx.mac\
${VIDEODIR}/m716text.o:${VIDEODIR}/m716text.asm ${VIDEODIR}/mode7.mac\ ${VIDEODIR}/newgfx2.mac ${VIDEODIR}/vidmacro.mac
macros.mac ${VIDEODIR}/newgfx16.o: ${VIDEODIR}/newgfx16.asm macros.mac\
${VIDEODIR}/newgfx.o:${VIDEODIR}/newgfx.asm ${VIDEODIR}/vidmacro.mac\ ${VIDEODIR}/newg162.mac ${VIDEODIR}/newgfx16.mac ${VIDEODIR}/vidmacro.mac
${VIDEODIR}/newgfx2.mac ${VIDEODIR}/newgfx.mac macros.mac ${VIDEODIR}/newgfx2.o: ${VIDEODIR}/newgfx2.asm macros.mac ${VIDEODIR}/newgfx.mac\
${VIDEODIR}/newgfx2.o:${VIDEODIR}/newgfx2.asm ${VIDEODIR}/newgfxwn.mac\ ${VIDEODIR}/newgfx2.mac ${VIDEODIR}/newgfxwn.mac ${VIDEODIR}/vidmacro.mac
${VIDEODIR}/newgfx.mac macros.mac ${VIDEODIR}/procvid.o: ${VIDEODIR}/procvid.asm macros.mac\
${VIDEODIR}/newgfx16.o: ${VIDEODIR}/newgfx16.asm macros.mac ${VIDEODIR}/vidmacro.mac\ ${VIDEODIR}/2xsaimmx.inc ${VIDEODIR}/copyvid.inc
${VIDEODIR}/newgfx16.mac ${VIDEODIR}/newg162.mac ${VIDEODIR}/procvidc.o: ${VIDEODIR}/procvidc.c gblhdr.h
${VIDEODIR}/newg162.o: macros.mac ${VIDEODIR}/newg162.asm ${VIDEODIR}/newg162.mac\ ${VIDEODIR}/sw_draw.o: ${VIDEODIR}/sw_draw.asm macros.mac
${VIDEODIR}/vidmacro.mac ${VIDEODIR}/newg16wn.mac
${ZIPDIR}/zpng.o: ${ZIPDIR}/zpng.c ${ZIPDIR}/zpng.h ${WINDIR}/copyvwin.o: ${WINDIR}/copyvwin.asm macros.mac
${ZIPDIR}/unzip.o: ${ZIPDIR}/unzip.c ${ZIPDIR}/zunzip.h ${WINDIR}/gl_draw.o: ${WINDIR}/gl_draw.c gblhdr.h
${WINDIR}/sdlintrf.o: ${WINDIR}/sdlintrf.asm macros.mac
${WINDIR}/sdllink.o: ${WINDIR}/sdllink.c gblhdr.h ${WINDIR}/sw_draw.h\
${WINDIR}/gl_draw.h
${WINDIR}/sw_draw.o: ${WINDIR}/sw_draw.c gblhdr.h
${WINDIR}/zfilew.o: ${WINDIR}/zfilew.c
${ZIPDIR}/unzip.o: ${ZIPDIR}/unzip.c gblhdr.h ${ZIPDIR}/zunzip.h
${ZIPDIR}/zpng.o: ${ZIPDIR}/zpng.c gblhdr.h ${ZIPDIR}/zpng.h
install: install:
@INSTALL@ -d -m 0755 ${DESTDIR}/@prefix@/bin @INSTALL@ -d -m 0755 ${DESTDIR}/@prefix@/bin

View File

@@ -34,7 +34,6 @@ EXTSYM fxxand
EXTSYM PLOTJmpa,PLOTJmpb EXTSYM PLOTJmpa,PLOTJmpb
%include "chips/fxemu2.mac" %include "chips/fxemu2.mac"
%include "chips/fxemu2b.mac"
%include "chips/fxemu2c.mac" %include "chips/fxemu2c.mac"

View File

@@ -24,7 +24,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include "sw_draw.h" #include "sw_draw.h"
#include "gl_draw.h" #include "gl_draw.h"
#include "SDL_thread.h" #include <SDL_thread.h>
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>

View File

@@ -39,13 +39,13 @@ ifneq (${ENV},) #end if is at the bottom of the file
CHIPDIR=chips CHIPDIR=chips
CPUDIR=cpu CPUDIR=cpu
DOSDIR=dos DOSDIR=dos
EFFECTSDIR=effects
GUIDIR=gui GUIDIR=gui
JMADIR=jma
NETDIR=net
VIDEODIR=video VIDEODIR=video
WINDIR=win WINDIR=win
NETDIR=net
ZIPDIR=zip ZIPDIR=zip
EFFECTSDIR=effects
JMADIR=jma
DELETECOMMAND=rm -f DELETECOMMAND=rm -f
TRUTH=;true TRUTH=;true
@@ -145,8 +145,8 @@ ASMFLAGS=${ASMFLAGSORIG} -f ${FILEFORMAT} -D${OS}
CHIPSOBJ=${CHIPDIR}/dsp1emu${OE} ${CHIPDIR}/fxemu2${OE} ${CHIPDIR}/sfxproc${OE}\ CHIPSOBJ=${CHIPDIR}/dsp1emu${OE} ${CHIPDIR}/fxemu2${OE} ${CHIPDIR}/sfxproc${OE}\
${CHIPDIR}/fxemu2b${OE} ${CHIPDIR}/fxemu2c${OE} ${CHIPDIR}/fxtable${OE}\ ${CHIPDIR}/fxemu2b${OE} ${CHIPDIR}/fxemu2c${OE} ${CHIPDIR}/fxtable${OE}\
${CHIPDIR}/sa1proc${OE} ${CHIPDIR}/sa1regs${OE} ${CHIPDIR}/dsp1proc${OE}\ ${CHIPDIR}/sa1proc${OE} ${CHIPDIR}/sa1regs${OE} ${CHIPDIR}/dsp1proc${OE}\
${CHIPDIR}/st10proc${OE} ${CHIPDIR}/seta10${OE} ${CHIPDIR}/dsp2proc${OE}\ ${CHIPDIR}/st10proc${OE} ${CHIPDIR}/seta10${OE} ${CHIPDIR}/dsp2proc${OE}\
${CHIPDIR}/sdd1emu${OE} ${CHIPDIR}/c4emu${OE} ${CHIPDIR}/dsp4proc${OE}\ ${CHIPDIR}/sdd1emu${OE} ${CHIPDIR}/c4emu${OE} ${CHIPDIR}/dsp4proc${OE}\
${CHIPDIR}/dsp4emu${OE} ${CHIPDIR}/dsp4emu${OE}
@@ -156,8 +156,23 @@ CPUOBJ=${CPUDIR}/dma${OE} ${CPUDIR}/dsp${OE} ${CPUDIR}/dspproc${OE}\
${CPUDIR}/stable${OE} ${CPUDIR}/table${OE} ${CPUDIR}/tableb${OE}\ ${CPUDIR}/stable${OE} ${CPUDIR}/table${OE} ${CPUDIR}/tableb${OE}\
${CPUDIR}/tablec${OE} ${CPUDIR}/tablec${OE}
DOSOBJORIG=${DOSDIR}/debug${OE} ${DOSDIR}/joy${OE} ${DOSDIR}/vesa2${OE}\
${DOSDIR}/initvid${OE} ${DOSDIR}/sw${OE} ${DOSDIR}/gppro${OE} ${DOSDIR}/vesa12${OE}
EFFECTSOBJ=${EFFECTSDIR}/burn${OE} ${EFFECTSDIR}/water${OE} ${EFFECTSDIR}/smoke${OE}
GUIOBJ=${GUIDIR}/gui${OE} ${GUIDIR}/guifuncs${OE} ${GUIDIR}/menu${OE} GUIOBJ=${GUIDIR}/gui${OE} ${GUIDIR}/guifuncs${OE} ${GUIDIR}/menu${OE}
JMAOBJ=${JMADIR}/7zlzma${OE} ${JMADIR}/crc32${OE} ${JMADIR}/iiostrm${OE}\
${JMADIR}/inbyte${OE} ${JMADIR}/jma${OE} ${JMADIR}/lzma${OE} ${JMADIR}/lzmadec${OE}\
${JMADIR}/winout${OE} ${JMADIR}/zsnesjma${OE}
MAINOBJ=cfgload${OE} endmem${OE} init${OE} initc${OE} uic${OE} patch${OE}\
ui${OE} vcache${OE} version${OE} zmovie${OE} zstate${OE} zloader${OE} cfgparse${OE}
NETOBJ=
#${NETDIR}/ztcp${OE}
VIDEOBJ=${VIDEODIR}/makev16b${OE} ${VIDEODIR}/makev16t${OE} ${VIDEODIR}/makevid${OE}\ VIDEOBJ=${VIDEODIR}/makev16b${OE} ${VIDEODIR}/makev16t${OE} ${VIDEODIR}/makevid${OE}\
${VIDEODIR}/mode716${OE} ${VIDEODIR}/mode716b${OE} ${VIDEODIR}/mode716d${OE}\ ${VIDEODIR}/mode716${OE} ${VIDEODIR}/mode716b${OE} ${VIDEODIR}/mode716d${OE}\
${VIDEODIR}/mode716e${OE} ${VIDEODIR}/mode716t${OE} ${VIDEODIR}/mode7${OE}\ ${VIDEODIR}/mode716e${OE} ${VIDEODIR}/mode716t${OE} ${VIDEODIR}/mode7${OE}\
@@ -165,31 +180,16 @@ VIDEOBJ=${VIDEODIR}/makev16b${OE} ${VIDEODIR}/makev16t${OE} ${VIDEODIR}/makevid$
${VIDEODIR}/newgfx16${OE} ${VIDEODIR}/newgfx2${OE} ${VIDEODIR}/newgfx${OE}\ ${VIDEODIR}/newgfx16${OE} ${VIDEODIR}/newgfx2${OE} ${VIDEODIR}/newgfx${OE}\
${VIDEODIR}/m716text${OE} ${VIDEODIR}/procvid${OE} ${VIDEODIR}/procvidc${OE} ${VIDEODIR}/m716text${OE} ${VIDEODIR}/procvid${OE} ${VIDEODIR}/procvidc${OE}
WINVIDOBJ=${VIDEODIR}/sw_draw${OE} ${VIDEODIR}/hq2x16${OE} ${VIDEODIR}/hq2x32${OE}\
${VIDEODIR}/2xsaiw${OE} ${VIDEODIR}/hq3x16${OE} ${VIDEODIR}/hq3x32${OE}\
${VIDEODIR}/hq4x16${OE} ${VIDEODIR}/hq4x32${OE}
#only used on Win32 #only used on Win32
WINOBJ=${WINDIR}/copyvwin${OE} ${DRESOBJ}\ WINOBJ=${WINDIR}/copyvwin${OE} ${DRESOBJ}\
${WINDIR}/winintrf${OE} ${WINDIR}/winlink${OE} ${WINDIR}/zfilew${OE} ${WINDIR}/winintrf${OE} ${WINDIR}/winlink${OE} ${WINDIR}/zfilew${OE}
NETOBJ= WINVIDOBJ=${VIDEODIR}/sw_draw${OE} ${VIDEODIR}/hq2x16${OE} ${VIDEODIR}/hq2x32${OE}\
#${NETDIR}/ztcp${OE} ${VIDEODIR}/2xsaiw${OE} ${VIDEODIR}/hq3x16${OE} ${VIDEODIR}/hq3x32${OE}\
${VIDEODIR}/hq4x16${OE} ${VIDEODIR}/hq4x32${OE}
ZIPOBJ=${ZIPDIR}/unzip${OE} ${ZIPDIR}/zpng${OE} ZIPOBJ=${ZIPDIR}/unzip${OE} ${ZIPDIR}/zpng${OE}
EFFECTSOBJ=${EFFECTSDIR}/burn${OE} ${EFFECTSDIR}/water${OE} ${EFFECTSDIR}/smoke${OE}
JMAOBJ=${JMADIR}/7zlzma${OE} ${JMADIR}/crc32${OE} ${JMADIR}/iiostrm${OE}\
${JMADIR}/inbyte${OE} ${JMADIR}/jma${OE} ${JMADIR}/lzma${OE} ${JMADIR}/lzmadec${OE}\
${JMADIR}/winout${OE} ${JMADIR}/zsnesjma${OE}
MAINOBJ=cfgload${OE} endmem${OE} init${OE} initc${OE} uic${OE} patch${OE}\
ui${OE} vcache${OE} version${OE} zmovie${OE} zstate${OE} zloader${OE} cfgparse${OE}
DOSOBJORIG=${DOSDIR}/debug${OE} ${DOSDIR}/joy${OE} ${DOSDIR}/vesa2${OE}\
${DOSDIR}/initvid${OE} ${DOSDIR}/sw${OE} ${DOSDIR}/gppro${OE} ${DOSDIR}/vesa12${OE}
OBJSORIG=${CHIPSOBJ} ${CPUOBJ} ${GUIOBJ} ${VIDEOBJ} ${MAINOBJ} ${ZIPOBJ} ${EFFECTSOBJ} ${JMAOBJ} OBJSORIG=${CHIPSOBJ} ${CPUOBJ} ${GUIOBJ} ${VIDEOBJ} ${MAINOBJ} ${ZIPOBJ} ${EFFECTSOBJ} ${JMAOBJ}
@@ -252,156 +252,180 @@ else
cl @link.vc ${WINDIR}/zsnes.res /link cl @link.vc ${WINDIR}/zsnes.res /link
endif endif
vcache${OE}: $< macros.mac cfgload${OE}: cfgload.c
ui${OE}: $< macros.mac cfgparse${OE}: cfgparse.psr
cfgload${OE}: $< macros.mac endmem${OE}: endmem.asm macros.mac
init${OE}: $< macros.mac init${OE}: init.asm macros.mac
initc${OE}: $< ${CPUDIR}/memtable.h ${JMADIR}/zsnesjma.h initc${OE}: initc.c asm_call.h ${CPUDIR}/memtable.h ${JMADIR}/zsnesjma.h\
uic${OE}: $< ${ZIPDIR}/zunzip.h
patch${OE}: $< patch${OE}: patch.c ${ZIPDIR}/zunzip.h
endmem${OE}: $< macros.mac ui${OE}: ui.asm macros.mac
zmovie${OE}: $< gblvars.h uic${OE}: uic.c asm_call.h
zstate${OE}: $< gblvars.h vcache${OE}: vcache.asm macros.mac
zloader${OE}: $< version${OE}: version.c
zloader${OE}: zloader.c
zmovie${OE}: zmovie.c asm_call.h gblvars.h numconv.h
zstate${OE}: zstate.c asm_call.h gblvars.h numconv.h
${CPUDIR}/execute${OE}: $< macros.mac ${CHIPDIR}/c4emu${OE}: ${CHIPDIR}/c4emu.c
${CPUDIR}/executec${OE}: $< ${CHIPDIR}/dsp1emu${OE}: ${CHIPDIR}/dsp1emu.c
${CPUDIR}/table${OE}: $< ${CPUDIR}/65816d.inc ${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816.inc\ ${CHIPDIR}/dsp1proc${OE}: ${CHIPDIR}/dsp1proc.asm macros.mac
${CPUDIR}/regs.mac ${CPUDIR}/regs.inc ${CPUDIR}/regsw.mac ${CPUDIR}/regsw.inc macros.mac ${CHIPDIR}/dsp2proc${OE}: ${CHIPDIR}/dsp2proc.asm macros.mac
${CPUDIR}/tableb${OE}: $< ${CPUDIR}/65816db.inc ${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816b.inc\ ${CHIPDIR}/dsp4emu${OE}: ${CHIPDIR}/dsp4emu.c
${CPUDIR}/regs.mac macros.mac ${CHIPDIR}/dsp4proc${OE}: ${CHIPDIR}/dsp4proc.asm macros.mac
${CPUDIR}/tablec${OE}: $< ${CPUDIR}/65816dc.inc ${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816c.inc\ ${CHIPDIR}/fxemu2${OE}: ${CHIPDIR}/fxemu2.asm macros.mac ${CHIPDIR}/fxemu2.mac
${CPUDIR}/regs.mac macros.mac ${CHIPDIR}/fxemu2b${OE}: ${CHIPDIR}/fxemu2b.asm macros.mac ${CHIPDIR}/fxemu2.mac\
${CPUDIR}/stable${OE}: $< ${CPUDIR}/s65816d.inc ${CPUDIR}/saddress.inc ${CPUDIR}/saddrni.inc\ ${CHIPDIR}/fxemu2b.mac
${CPUDIR}/se65816.inc macros.mac ${CHIPDIR}/fxemu2c${OE}: ${CHIPDIR}/fxemu2c.asm macros.mac ${CHIPDIR}/fxemu2.mac\
${CPUDIR}/memory${OE}: $< macros.mac ${CHIPDIR}/fxemu2c.mac
${CPUDIR}/memtable${OE}: ${CPUDIR}/memtable.h $< ${CHIPDIR}/fxtable${OE}: ${CHIPDIR}/fxtable.asm macros.mac
${CPUDIR}/dma${OE}: $< macros.mac ${CHIPDIR}/sa1proc${OE}: ${CHIPDIR}/sa1proc.asm macros.mac
${CPUDIR}/irq${OE}: $< macros.mac ${CHIPDIR}/sa1regs${OE}: ${CHIPDIR}/sa1regs.asm macros.mac\
${CPUDIR}/dspproc${OE}: $< macros.mac ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac
${CPUDIR}/spc700${OE}: $< macros.mac ${CPUDIR}/regsw.mac ${CPUDIR}/spcdef.inc ${CPUDIR}/spcaddr.inc ${CHIPDIR}/sdd1emu${OE}: ${CHIPDIR}/sdd1emu.c
${CPUDIR}/dsp${OE}: $< macros.mac ${CHIPDIR}/seta10${OE}: ${CHIPDIR}/seta10.c
${CHIPDIR}/sfxproc${OE}: ${CHIPDIR}/sfxproc.asm macros.mac\
${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac
${CHIPDIR}/st10proc${OE}: ${CHIPDIR}/st10proc.asm macros.mac
${VIDEODIR}/makevid${OE}: $< ${VIDEODIR}/vidmacro.mac macros.mac ${CPUDIR}/dma${OE}: ${CPUDIR}/dma.asm macros.mac
${VIDEODIR}/makev16b${OE}: $< ${VIDEODIR}/vidmacro.mac macros.mac ${CPUDIR}/dsp${OE}: ${CPUDIR}/dsp.asm macros.mac
${VIDEODIR}/makev16t${OE}: $< ${VIDEODIR}/vidmacro.mac macros.mac ${CPUDIR}/dspproc${OE}: ${CPUDIR}/dspproc.asm macros.mac ${CPUDIR}/fir_tables.inc
${VIDEODIR}/mv16tms${OE}: $< ${VIDEODIR}/vidmacro.mac macros.mac ${CPUDIR}/execute${OE}: ${CPUDIR}/execute.asm macros.mac
${VIDEODIR}/mode7${OE}: $< ${VIDEODIR}/mode7.mac macros.mac ${CPUDIR}/executec${OE}: ${CPUDIR}/executec.c gblvars.h
${VIDEODIR}/mode716${OE}: $< ${VIDEODIR}/mode716.mac macros.mac ${CPUDIR}/irq${OE}: ${CPUDIR}/irq.asm macros.mac
${VIDEODIR}/mode716b${OE}: $< ${VIDEODIR}/mode7.mac macros.mac ${CPUDIR}/memory${OE}: ${CPUDIR}/memory.asm macros.mac
${VIDEODIR}/mode716t${OE}: $< ${VIDEODIR}/mode7.mac macros.mac ${CPUDIR}/memtable${OE}: ${CPUDIR}/memtable.c gblvars.h ${CPUDIR}/memtable.h
${VIDEODIR}/mode716d${OE}: $< ${VIDEODIR}/mode7.mac macros.mac ${CPUDIR}/spc700${OE}: ${CPUDIR}/spc700.asm macros.mac ${CPUDIR}/regsw.mac\
${VIDEODIR}/mode7ext${OE}: $< macros.mac ${CPUDIR}/spcaddr.inc ${CPUDIR}/spcdef.inc
${VIDEODIR}/mode716e${OE}: $< macros.mac ${CPUDIR}/stable${OE}: ${CPUDIR}/stable.asm macros.mac ${CPUDIR}/s65816d.inc\
${VIDEODIR}/m716text${OE}: $< ${VIDEODIR}/mode7.mac macros.mac ${CPUDIR}/saddress.inc ${CPUDIR}/saddrni.inc ${CPUDIR}/se65816.inc
${VIDEODIR}/procvid${OE}: $< macros.mac ${VIDEODIR}/copyvid.inc ${VIDEODIR}/2xsaimmx.inc ${CPUDIR}/table${OE}: ${CPUDIR}/table.asm macros.mac ${CPUDIR}/65816d.inc\
${VIDEODIR}/procvidc${OE}: $< ${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816.inc\
${CPUDIR}/regs.inc ${CPUDIR}/regs.mac ${CPUDIR}/regsw.inc ${CPUDIR}/regsw.mac
${CPUDIR}/tableb${OE}: ${CPUDIR}/tableb.asm macros.mac ${CPUDIR}/65816db.inc\
${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816b.inc
${CPUDIR}/tablec${OE}: ${CPUDIR}/tablec.asm macros.mac ${CPUDIR}/65816dc.inc\
${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816c.inc
${VIDEODIR}/2xsaiw${OE}: $< macros.mac ${DOSDIR}/debug${OE}: ${DOSDIR}/debug.asm macros.mac
${VIDEODIR}/sw_draw${OE}: $< macros.mac ${DOSDIR}/dosintrf${OE}: ${DOSDIR}/dosintrf.asm macros.mac
${VIDEODIR}/hq2x16${OE}: $< macros.mac ${DOSDIR}/gppro${OE}: ${DOSDIR}/gppro.asm macros.mac
${VIDEODIR}/hq2x32${OE}: $< macros.mac ${DOSDIR}/initvid${OE}: ${DOSDIR}/initvid.asm macros.mac ${DOSDIR}/vga.inc
${VIDEODIR}/hq3x16${OE}: $< macros.mac ${DOSDIR}/joy${OE}: ${DOSDIR}/joy.asm macros.mac
${VIDEODIR}/hq3x32${OE}: $< macros.mac ${DOSDIR}/sound${OE}: ${DOSDIR}/sound.asm macros.mac
${VIDEODIR}/hq4x16${OE}: $< macros.mac ${DOSDIR}/sw${OE}: ${DOSDIR}/sw.asm macros.mac
${VIDEODIR}/hq4x32${OE}: $< macros.mac ${DOSDIR}/vesa12${OE}: ${DOSDIR}/vesa12.asm macros.mac
${DOSDIR}/vesa2${OE}: ${DOSDIR}/vesa2.asm macros.mac
${DOSDIR}/zfile${OE}: ${DOSDIR}/zfile.c
${CHIPDIR}/dsp1proc${OE}: $< macros.mac ${EFFECTSDIR}/burn${OE}: ${EFFECTSDIR}/burn.c
${CHIPDIR}/sa1regs${OE}: $< macros.mac ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac ${EFFECTSDIR}/smoke${OE}: ${EFFECTSDIR}/smoke.c
${CHIPDIR}/sfxproc${OE}: $< macros.mac ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac ${EFFECTSDIR}/water${OE}: ${EFFECTSDIR}/water.c ${EFFECTSDIR}/fixsin.h
${CHIPDIR}/dsp1emu${OE}: $<
${CHIPDIR}/st10proc${OE}: $<
${CHIPDIR}/seta10${OE}: $<
${CHIPDIR}/c4emu${OE}: $<
${CHIPDIR}/sdd1emu${OE}: $<
${CHIPDIR}/fxemu2${OE}: $< ${CHIPDIR}/fxemu2.mac macros.mac
${CHIPDIR}/fxemu2b${OE}: $< ${CHIPDIR}/fxemu2.mac ${CHIPDIR}/fxemu2b.mac
${CHIPDIR}/fxemu2c${OE}: $< macros.mac ${CHIPDIR}/fxemu2.mac ${CHIPDIR}/fxemu2b.mac ${CHIPDIR}/fxemu2c.mac
${CHIPDIR}/fxtable${OE}: $< macros.mac
${CHIPDIR}/sa1proc${OE}: $< macros.mac
${CHIPDIR}/dsp4proc${OE}: $< macros.mac
${CHIPDIR}/dsp4emu${OE}: $<
${GUIDIR}/gui${OE}: ${GUIDIR}/gui.asm macros.mac ${GUIDIR}/guicheat.inc\
${GUIDIR}/guicombo.inc ${GUIDIR}/guikeys.inc ${GUIDIR}/guiload.inc\
${GUIDIR}/guimisc.inc ${GUIDIR}/guimouse.inc ${GUIDIR}/guitools.inc\
${GUIDIR}/guiwindp.inc
${GUIDIR}/guifuncs${OE}: ${GUIDIR}/guifuncs.c
${GUIDIR}/menu${OE}: ${GUIDIR}/menu.asm macros.mac
${GUIDIR}/gui${OE}: $< ${GUIDIR}/guitools.inc\ ${JMADIR}/7zlzma${OE}: ${JMADIR}/7zlzma.cpp ${JMADIR}/7z.h ${JMADIR}/lzmadec.h
${GUIDIR}/guimisc.inc ${GUIDIR}/guimouse.inc ${GUIDIR}/guiwindp.inc\ ${JMADIR}/crc32${OE}: ${JMADIR}/crc32.cpp
${GUIDIR}/guikeys.inc ${GUIDIR}/guicheat.inc\ ${JMADIR}/iiostrm${OE}: ${JMADIR}/iiostrm.cpp ${JMADIR}/crc32.h ${JMADIR}/iiostrm.h\
${GUIDIR}/guicombo.inc ${GUIDIR}/guiload.inc macros.mac ${JMADIR}/portable.h
${GUIDIR}/guifuncs${OE}: $< ${JMADIR}/inbyte${OE}: ${JMADIR}/inbyte.cpp ${JMADIR}/inbyte.h
${GUIDIR}/menu${OE}: $< macros.mac ${JMADIR}/jma${OE}: ${JMADIR}/jma.cpp ${JMADIR}/7z.h ${JMADIR}/crc32.h\
${JMADIR}/jma.h ${JMADIR}/portable.h
${JMADIR}/lzma${OE}: ${JMADIR}/lzma.cpp ${JMADIR}/lzma.h
${JMADIR}/lzmadec${OE}: ${JMADIR}/lzmadec.cpp ${JMADIR}/lzmadec.h\
${JMADIR}/portable.h
${JMADIR}/winout${OE}: ${JMADIR}/winout.cpp ${JMADIR}/winout.h
${JMADIR}/zsnesjma${OE}: ${JMADIR}/zsnesjma.cpp ${JMADIR}/jma.h\
${JMADIR}/zsnesjma.h
${EFFECTSDIR}/water${OE}: $< ${EFFECTSDIR}/fixsin.h ${VIDEODIR}/2xsaiw${OE}: ${VIDEODIR}/2xsaiw.asm macros.mac
${EFFECTSDIR}/smoke${OE}: $< ${VIDEODIR}/hq2x16${OE}: ${VIDEODIR}/hq2x16.asm macros.mac
${EFFECTSDIR}/burn${OE}: $< ${VIDEODIR}/hq2x32${OE}: ${VIDEODIR}/hq2x32.asm macros.mac
${VIDEODIR}/hq3x16${OE}: ${VIDEODIR}/hq3x16.asm macros.mac
${VIDEODIR}/hq3x32${OE}: ${VIDEODIR}/hq3x32.asm macros.mac
${VIDEODIR}/hq4x16${OE}: ${VIDEODIR}/hq4x16.asm macros.mac
${VIDEODIR}/hq4x32${OE}: ${VIDEODIR}/hq4x32.asm macros.mac
${VIDEODIR}/m716text${OE}: ${VIDEODIR}/m716text.asm macros.mac
${VIDEODIR}/makev16b${OE}: ${VIDEODIR}/makev16b.asm macros.mac\
${VIDEODIR}/vidmacro.mac
${VIDEODIR}/makev16t${OE}: ${VIDEODIR}/makev16t.asm macros.mac\
${VIDEODIR}/vidmacro.mac
${VIDEODIR}/makevid${OE}: ${VIDEODIR}/makevid.asm macros.mac\
${VIDEODIR}/vidmacro.mac
${VIDEODIR}/mode7${OE}: ${VIDEODIR}/mode7.asm macros.mac ${VIDEODIR}/mode7.mac
${VIDEODIR}/mode716${OE}: ${VIDEODIR}/mode716.asm macros.mac ${VIDEODIR}/mode716.mac
${VIDEODIR}/mode716b${OE}: ${VIDEODIR}/mode716b.asm macros.mac ${VIDEODIR}/mode7.mac
${VIDEODIR}/mode716d${OE}: ${VIDEODIR}/mode716d.asm macros.mac ${VIDEODIR}/mode7.mac
${VIDEODIR}/mode716e${OE}: ${VIDEODIR}/mode716e.asm macros.mac
${VIDEODIR}/mode716t${OE}: ${VIDEODIR}/mode716t.asm macros.mac ${VIDEODIR}/mode7.mac
${VIDEODIR}/mode7ext${OE}: ${VIDEODIR}/mode7ext.asm macros.mac ${VIDEODIR}/mode7.mac
${VIDEODIR}/mv16tms${OE}: ${VIDEODIR}/mv16tms.asm macros.mac\
${VIDEODIR}/vidmacro.mac
${VIDEODIR}/newg162${OE}: ${VIDEODIR}/newg162.asm macros.mac\
${VIDEODIR}/newg162.mac ${VIDEODIR}/newg16wn.mac ${VIDEODIR}/newgfx16.mac\
${VIDEODIR}/vidmacro.mac
${VIDEODIR}/newfgx${OE}: ${VIDEODIR}/newfgx.asm macros.mac ${VIDEODIR}/newgfx.mac\
${VIDEODIR}/newgfx2.mac ${VIDEODIR}/vidmacro.mac
${VIDEODIR}/newgfx16${OE}: ${VIDEODIR}/newgfx16.asm macros.mac\
${VIDEODIR}/newg162.mac ${VIDEODIR}/newgfx16.mac ${VIDEODIR}/vidmacro.mac
${VIDEODIR}/newgfx2${OE}: ${VIDEODIR}/newgfx2.asm macros.mac ${VIDEODIR}/newgfx.mac\
${VIDEODIR}/newgfx2.mac ${VIDEODIR}/newgfxwn.mac ${VIDEODIR}/vidmacro.mac
${VIDEODIR}/procvid${OE}: ${VIDEODIR}/procvid.asm macros.mac\
${VIDEODIR}/2xsaimmx.inc ${VIDEODIR}/copyvid.inc
${VIDEODIR}/procvidc${OE}: ${VIDEODIR}/procvidc.c
${VIDEODIR}/sw_draw${OE}: ${VIDEODIR}/sw_draw.asm macros.mac
${ZIPDIR}/unzip${OE}: $< ${ZIPDIR}/zunzip.h ${WINDIR}/copyvwin${OE}: ${WINDIR}/copyvwin.asm macros.mac
${ZIPDIR}/zpng${OE}: $< ${ZIPDIR}/zpng.h ${WINDIR}/winintrf${OE}: ${WINDIR}/winintrf.asm macros.mac
${WINDIR}/zfilew${OE}: ${WINDIR}/zfilew.c ${WINDIR}/resource.h
${JMADIR}/7zlzma${OE}: $< ${JMADIR}/7z.h ${JMADIR}/iiostrm.h
${JMADIR}/crc32${OE}: $< ${JMADIR}/crc32.h
${JMADIR}/iiostrm${OE}: $< ${JMADIR}/iiostrm.h ${JMADIR}/crc32.h
${JMADIR}/inbyte${OE}: $<
${JMADIR}/jma${OE}: $< ${JMADIR}/jma.h ${JMADIR}/crc32.h ${JMADIR}/portable.h\
${JMADIR}/7z.h ${JMADIR}/iiostrm.h
${JMADIR}/lzma${OE}: $<
${JMADIR}/lzmadec${OE}: $<
${JMADIR}/winout${OE}: $< ${JMADIR}/iiostrm.h
${JMADIR}/zsnesjma${OE}: $< ${JMADIR}/zsnesjma.h ${JMADIR}/jma.h
${DOSDIR}/debug${OE}: $< macros.mac
${DOSDIR}/dosintrf${OE}: $< macros.mac
${DOSDIR}/initvid${OE}: $< macros.mac ${DOSDIR}/vga.inc
${DOSDIR}/vesa2${OE}: $< macros.mac
${DOSDIR}/vesa12${OE}: $< macros.mac
${DOSDIR}/joy${OE}: $< macros.mac
${DOSDIR}/sw${OE}: $< macros.mac
${DOSDIR}/gppro${OE}: $< macros.mac
${NETDIR}/ztcp${OE}: $<
${WINDIR}/copyvwin${OE}: $< macros.mac
${WINDIR}/winintrf${OE}: $< macros.mac
${WINDIR}/zfilew${OE}: $<
ifeq (${ENV},msvc) ifeq (${ENV},msvc)
${WINDIR}/zsnes.res: ${WINDIR}/zsnes.rc
rc ${WINDIR}/zsnes.rc
${WINDIR}/winlink.obj: ${WINDIR}/winlink.cpp ${WINDIR}/resource.h ${WINDIR}/winlink.obj: ${WINDIR}/winlink.cpp ${WINDIR}/resource.h
${WINDIR}/zsnes.res: ${WINDIR}/zsnes.rc ${WINDIR}/afxres.h ${WINDIR}/resource.h
rc ${WINDIR}/zsnes.rc
else else
${WINDIR}/zsnes${OE}: ${WINDIR}/zsnes.rc
${WINDRES} --include-dir ${WINDIR} ${WINDIR}/zsnes.rc -o${WINDIR}/zsnes${OE}
${WINDIR}/winlink${OE}: ${WINDIR}/winlink.cpp ${WINDIR}/resource.h ${WINDIR}/winlink${OE}: ${WINDIR}/winlink.cpp ${WINDIR}/resource.h
${CPPC} -O0 ${CFLAGS} -masm=intel -o $@ -c ${WINDIR}/winlink.cpp ${CPPC} -O0 ${CFLAGS} -masm=intel -o $@ -c ${WINDIR}/winlink.cpp
${OBJFIX}: $< ${WINDIR}/zsnes${OE}: ${WINDIR}/zsnes.rc ${WINDIR}/afxres.h ${WINDIR}/resource.h
gcc -O3 -o $@ objfix.c ${WINDRES} --include-dir ${WINDIR} ${WINDIR}/zsnes.rc -o${WINDIR}/zsnes${OE}
${OBJFIX}: objfix.c
gcc -O3 -s -o $@ objfix.c
endif endif
${PSR}: $< ${PSR}: parsegen.cpp
ifeq (${ENV},msvc) ifeq (${ENV},msvc)
cl /EHsc /Fe$@ parsegen.cpp cl /EHsc /Fe$@ parsegen.cpp
${DELETECOMMAND} parsegen.obj ${DELETECOMMAND} parsegen.obj
else else
ifeq (${ENV},dos) ifeq (${ENV},dos)
gpp -O3 -o $@ parsegen.cpp gpp -O3 -s -o $@ parsegen.cpp
else else
g++ -O3 -o $@ parsegen.cpp g++ -O3 -s -o $@ parsegen.cpp
endif endif
endif endif
cfgparse${OE}: $<
${ZIPDIR}/unzip${OE}: ${ZIPDIR}/unzip.c ${ZIPDIR}/zunzip.h
${ZIPDIR}/zpng${OE}: ${ZIPDIR}/zpng.c ${ZIPDIR}/zpng.h
clean: clean:
${DELETECOMMAND} ${EXE} ${TRUTH} ${DELETECOMMAND} ${EXE} ${TRUTH}
${DELETECOMMAND} ${PSR} ${TRUTH} ${DELETECOMMAND} ${PSR} ${TRUTH}
${DELETECOMMAND} *${OE} ${TRUTH} ${DELETECOMMAND} *${OE} ${TRUTH}
${DELETECOMMAND} ${CPUDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${VIDEODIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${CHIPDIR}${SLASH}*${OE} ${TRUTH} ${DELETECOMMAND} ${CHIPDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${EFFECTSDIR}${SLASH}*${OE} ${TRUTH} ${DELETECOMMAND} ${CPUDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${ZIPDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${JMADIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${DOSDIR}${SLASH}*${OE} ${TRUTH} ${DELETECOMMAND} ${DOSDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${WINDIR}${SLASH}*${OE} ${TRUTH} ${DELETECOMMAND} ${EFFECTSDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${GUIDIR}${SLASH}*${OE} ${TRUTH} ${DELETECOMMAND} ${GUIDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${JMADIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${NETDIR}${SLASH}*${OE} ${TRUTH} ${DELETECOMMAND} ${NETDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${VIDEODIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${WINDIR}${SLASH}*${OE} ${TRUTH}
${DELETECOMMAND} ${ZIPDIR}${SLASH}*${OE} ${TRUTH}
else #else no ENV specified else #else no ENV specified
help: help:

View File

@@ -10,9 +10,9 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <zlib.h>
#endif #endif
#include "zlib.h"
#include "zunzip.h" #include "zunzip.h"
#ifdef STDC #ifdef STDC