From 1aa2f0e542060f6b6ecb7d6b1decc31dcad96d34 Mon Sep 17 00:00:00 2001 From: n-a-c-h <> Date: Sun, 21 Nov 2004 01:17:44 +0000 Subject: [PATCH] Removed unneeded files. --- zsnes/src/Makefile.in | 6 +- zsnes/src/jma/aribitcd.cpp | 40 ------------ zsnes/src/jma/aribitcd.h | 51 --------------- zsnes/src/jma/outbyte.cpp | 64 ------------------ zsnes/src/jma/outbyte.h | 61 ----------------- zsnes/src/jma/rngcoder.h | 107 ------------------------------ zsnes/src/link.win32 | 2 +- zsnes/src/makefile.dos | 130 ++++++++++++++++++------------------- zsnes/src/makefile.win | 130 ++++++++++++++++++------------------- 9 files changed, 131 insertions(+), 460 deletions(-) delete mode 100644 zsnes/src/jma/aribitcd.cpp delete mode 100644 zsnes/src/jma/outbyte.cpp delete mode 100644 zsnes/src/jma/outbyte.h diff --git a/zsnes/src/Makefile.in b/zsnes/src/Makefile.in index 2364bbd5..f11300b6 100644 --- a/zsnes/src/Makefile.in +++ b/zsnes/src/Makefile.in @@ -58,9 +58,9 @@ WINOBJ=${WINDIR}/copyvwin.o \ WINDOSOBJ=${DOSDIR}/debug.o ${DOSDIR}/joy.o ${DOSDIR}/modemrtn.o ${DOSDIR}/vesa2.o\ ${DOSDIR}/initvid.o ${DOSDIR}/sw.o ${DOSDIR}/gppro.o ${DOSDIR}/vesa12.o -JMAOBJ=${JMADIR}/7zlzma.o ${JMADIR}/aribitcd.o ${JMADIR}/crc32.o ${JMADIR}/iiostrm.o\ +JMAOBJ=${JMADIR}/7zlzma.o ${JMADIR}/crc32.o ${JMADIR}/iiostrm.o\ ${JMADIR}/inbyte.o ${JMADIR}/jma.o ${JMADIR}/lzma.o ${JMADIR}/lzmadec.o\ - ${JMADIR}/outbyte.o ${JMADIR}/winout.o ${JMADIR}/zsnesjma.o + ${JMADIR}/winout.o ${JMADIR}/zsnesjma.o ZIPOBJ=${ZIPDIR}/unzip.o ${ZIPDIR}/zpng.o @@ -196,14 +196,12 @@ endmem.o: endmem.asm macros.mac ${DOSDIR}/modemrtn.o: ${DOSDIR}/modemrtn.asm macros.mac ${JMADIR}/7zlzma.o: ${JMADIR}/7zlzma.cpp -${JMADIR}/aribitcd.o: ${JMADIR}/aribitcd.cpp ${JMADIR}/crc32.o: ${JMADIR}/crc32.cpp ${JMADIR}/crc32.h ${JMADIR}/iiostrm.o: ${JMADIR}/iiostrm.cpp ${JMADIR}/inbyte.o: ${JMADIR}/inbyte.cpp ${JMADIR}/jma.o: ${JMADIR}/jma.cpp ${JMADIR}/jma.h ${JMADIR}/crc32.h ${JMADIR}/portable.h ${JMADIR}/lzma.o: ${JMADIR}/lzma.cpp ${JMADIR}/lzmadec.o: ${JMADIR}/lzmadec.cpp -${JMADIR}/outbyte.o: ${JMADIR}/outbyte.cpp ${JMADIR}/winout.o: ${JMADIR}/winout.cpp ${JMADIR}/zsnesjma.o: ${JMADIR}/zsnesjma.cpp ${JMADIR}/zsnesjma.h ${JMADIR}/jma.h diff --git a/zsnes/src/jma/aribitcd.cpp b/zsnes/src/jma/aribitcd.cpp deleted file mode 100644 index b89f8345..00000000 --- a/zsnes/src/jma/aribitcd.cpp +++ /dev/null @@ -1,40 +0,0 @@ -/* -Copyright (C) 2002 Andrea Mazzoleni ( http://advancemame.sf.net ) -Copyright (C) 2001-4 Igor Pavlov ( http://www.7-zip.org ) - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "aribitcd.h" -#include "ariprice.h" - -#include - -namespace NCompression { -namespace NArithmetic { - -static const double kDummyMultMid = (1.0 / kBitPrice) / 2; - -CPriceTables::CPriceTables() -{ - double aLn2 = log(2); - double aLnAll = log(kBitModelTotal >> kNumMoveReducingBits); - for(UINT32 i = 1; i < (kBitModelTotal >> kNumMoveReducingBits) - 1; i++) - m_StatePrices[i] = UINT32((fabs(aLnAll - log(i)) / aLn2 + kDummyMultMid) * kBitPrice); -} - -CPriceTables g_PriceTables; - -}} diff --git a/zsnes/src/jma/aribitcd.h b/zsnes/src/jma/aribitcd.h index 482dd74a..76677027 100644 --- a/zsnes/src/jma/aribitcd.h +++ b/zsnes/src/jma/aribitcd.h @@ -11,57 +11,6 @@ const UINT32 kBitModelTotal = (1 << kNumBitModelTotalBits); const int kNumMoveReducingBits = 2; - -class CPriceTables -{ -public: - UINT32 m_StatePrices[kBitModelTotal >> kNumMoveReducingBits]; - CPriceTables(); -}; - -extern CPriceTables g_PriceTables; - - -///////////////////////////// -// CBitModel - -template -class CBitModel -{ -public: - UINT32 m_Probability; - void UpdateModel(UINT32 aSymbol) - { - /* - m_Probability -= (m_Probability + ((aSymbol - 1) & ((1 << aNumMoveBits) - 1))) >> aNumMoveBits; - m_Probability += (1 - aSymbol) << (kNumBitModelTotalBits - aNumMoveBits); - */ - if (aSymbol == 0) - m_Probability += (kBitModelTotal - m_Probability) >> aNumMoveBits; - else - m_Probability -= (m_Probability) >> aNumMoveBits; - } -public: - void Init() { m_Probability = kBitModelTotal / 2; } -}; - -template -class CBitEncoder: public CBitModel -{ -public: - void Encode(CRangeEncoder *aRangeEncoder, UINT32 aSymbol) - { - aRangeEncoder->EncodeBit(CBitModel::m_Probability, kNumBitModelTotalBits, aSymbol); - CBitModel::UpdateModel(aSymbol); - } - UINT32 GetPrice(UINT32 aSymbol) const - { - return g_PriceTables.m_StatePrices[ - (((CBitModel::m_Probability - aSymbol) ^ ((-(int)aSymbol))) & (kBitModelTotal - 1)) >> kNumMoveReducingBits]; - } -}; - - template class CBitDecoder: public CBitModel { diff --git a/zsnes/src/jma/outbyte.cpp b/zsnes/src/jma/outbyte.cpp deleted file mode 100644 index a66003d0..00000000 --- a/zsnes/src/jma/outbyte.cpp +++ /dev/null @@ -1,64 +0,0 @@ -/* -Copyright (C) 2002 Andrea Mazzoleni ( http://advancemame.sf.net ) -Copyright (C) 2001-4 Igor Pavlov ( http://www.7-zip.org ) - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#include "outbyte.h" - -namespace NStream { - -COutByte::COutByte(UINT32 aBufferSize): - m_BufferSize(aBufferSize) -{ - m_Buffer = new BYTE[m_BufferSize]; -} - -COutByte::~COutByte() -{ - delete []m_Buffer; -} - -void COutByte::Init(ISequentialOutStream *aStream) -{ - m_Stream = aStream; - m_ProcessedSize = 0; - m_Pos = 0; -} - -HRESULT COutByte::Flush() -{ - if (m_Pos == 0) - return S_OK; - UINT32 aProcessedSize; - HRESULT aResult = m_Stream->Write(m_Buffer, m_Pos, &aProcessedSize); - if (aResult != S_OK) - return aResult; - if (m_Pos != aProcessedSize) - return E_FAIL; - m_ProcessedSize += aProcessedSize; - m_Pos = 0; - return S_OK; -} - -void COutByte::WriteBlock() -{ - HRESULT aResult = Flush(); - if (aResult != S_OK) - throw aResult; -} - -} diff --git a/zsnes/src/jma/outbyte.h b/zsnes/src/jma/outbyte.h deleted file mode 100644 index 5944fe21..00000000 --- a/zsnes/src/jma/outbyte.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -Copyright (C) 2002 Andrea Mazzoleni ( http://advancemame.sf.net ) -Copyright (C) 2001-4 Igor Pavlov ( http://www.7-zip.org ) - -This library is free software; you can redistribute it and/or -modify it under the terms of the GNU Lesser General Public -License as published by the Free Software Foundation; either -version 2.1 of the License, or (at your option) any later version. - -This library is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public -License along with this library; if not, write to the Free Software -Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -*/ - -#ifndef __STREAM_OUTBYTE_H -#define __STREAM_OUTBYTE_H - -#include "portable.h" -#include "iiostrm.h" - -namespace NStream { - -class COutByte -{ - BYTE *m_Buffer; - UINT32 m_Pos; - UINT32 m_BufferSize; - ISequentialOutStream* m_Stream; - UINT64 m_ProcessedSize; - - void WriteBlock(); -public: - COutByte(UINT32 aBufferSize = (1 << 20)); - ~COutByte(); - - void Init(ISequentialOutStream *aStream); - HRESULT Flush(); - - void WriteByte(BYTE aByte) - { - m_Buffer[m_Pos++] = aByte; - if(m_Pos >= m_BufferSize) - WriteBlock(); - } - void WriteBytes(const void *aBytes, UINT32 aSize) - { - for (UINT32 i = 0; i < aSize; i++) - WriteByte(((const BYTE *)aBytes)[i]); - } - - UINT64 GetProcessedSize() const { return m_ProcessedSize + m_Pos; } -}; - -} - -#endif diff --git a/zsnes/src/jma/rngcoder.h b/zsnes/src/jma/rngcoder.h index 0d8a2754..0916f23e 100644 --- a/zsnes/src/jma/rngcoder.h +++ b/zsnes/src/jma/rngcoder.h @@ -21,7 +21,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #define __COMPRESSION_RANGECODER_H #include "inbyte.h" -#include "outbyte.h" namespace NCompression { namespace NArithmetic { @@ -29,112 +28,6 @@ namespace NArithmetic { const UINT32 kNumTopBits = 24; const UINT32 kTopValue = (1 << kNumTopBits); -class CRangeEncoder -{ - NStream::COutByte m_Stream; - UINT64 m_Low; - UINT32 m_Range; - UINT32 m_FFNum; - BYTE m_Cache; - -public: - void Init(ISequentialOutStream *aStream) - { - m_Stream.Init(aStream); - m_Low = 0; - m_Range = UINT32(-1); - m_FFNum = 0; - m_Cache = 0; - } - - void FlushData() - { - // m_Low += 1; - for(int i = 0; i < 5; i++) - ShiftLow(); - } - - HRESULT FlushStream() - { return m_Stream.Flush(); } - - void Encode(UINT32 aStart, UINT32 aSize, UINT32 aTotal) - { - m_Low += aStart * (m_Range /= aTotal); - m_Range *= aSize; - while (m_Range < kTopValue) - { - m_Range <<= 8; - ShiftLow(); - } - } - - /* - void EncodeDirectBitsDiv(UINT32 aValue, UINT32 aNumTotalBits) - { - m_Low += aValue * (m_Range >>= aNumTotalBits); - Normalize(); - } - - void EncodeDirectBitsDiv2(UINT32 aValue, UINT32 aNumTotalBits) - { - if (aNumTotalBits <= kNumBottomBits) - EncodeDirectBitsDiv(aValue, aNumTotalBits); - else - { - EncodeDirectBitsDiv(aValue >> kNumBottomBits, (aNumTotalBits - kNumBottomBits)); - EncodeDirectBitsDiv(aValue & ((1 << kBottomValueBits) - 1), kNumBottomBits); - } - } - */ - void ShiftLow() - { - if (m_Low < (UINT32)0xFF000000 || UINT32(m_Low >> 32) == 1) - { - m_Stream.WriteByte(m_Cache + BYTE(m_Low >> 32)); - for (;m_FFNum != 0; m_FFNum--) - m_Stream.WriteByte(0xFF + BYTE(m_Low >> 32)); - m_Cache = BYTE(UINT32(m_Low) >> 24); - } - else - m_FFNum++; - m_Low = UINT32(m_Low) << 8; - } - - void EncodeDirectBits(UINT32 aValue, UINT32 aNumTotalBits) - { - for (int i = aNumTotalBits - 1; i >= 0; i--) - { - m_Range >>= 1; - if (((aValue >> i) & 1) == 1) - m_Low += m_Range; - if (m_Range < kTopValue) - { - m_Range <<= 8; - ShiftLow(); - } - } - } - - void EncodeBit(UINT32 aSize0, UINT32 aNumTotalBits, UINT32 aSymbol) - { - UINT32 aNewBound = (m_Range >> aNumTotalBits) * aSize0; - if (aSymbol == 0) - m_Range = aNewBound; - else - { - m_Low += aNewBound; - m_Range -= aNewBound; - } - while (m_Range < kTopValue) - { - m_Range <<= 8; - ShiftLow(); - } - } - - UINT64 GetProcessedSize() { return m_Stream.GetProcessedSize() + m_FFNum; } -}; - class CRangeDecoder { public: diff --git a/zsnes/src/link.win32 b/zsnes/src/link.win32 index aba7b53d..19999236 100644 --- a/zsnes/src/link.win32 +++ b/zsnes/src/link.win32 @@ -1,4 +1,4 @@ -/Fezsnesw.exe chips\dsp1proc.obj chips\dsp2proc.obj dos\sw.obj dos\gppro.obj dos\vesa12.obj dos\zsipx.obj dos\modemrtn.obj dos\joy.obj dos\debug.obj dos\vesa2.obj dos\initvid.obj cfgload.obj endmem.obj init.obj initc.obj uic.obj patch.obj ui.obj vcache.obj effects\water.obj effects\smoke.obj effects\burn.obj version.obj video\procvid.obj win\copyvwin.obj win\winintrf.obj win\winlink.obj win\zloaderw.obj win\ztcp.obj win\zfilew.obj win\zipxw.obj video\makev16b.obj video\makev16t.obj video\makevid.obj video\mode716.obj video\mode716b.obj video\mode716d.obj video\mode716e.obj video\mode716t.obj video\mode7.obj video\mode7ext.obj video\mv16tms.obj video\newg162.obj video\newgfx16.obj video\newgfx2.obj video\newgfx.obj video\m716text.obj video\2xsaiw.obj video\sw_draw.obj video\hq2x16.obj video\hq2x32.obj video\hq3x16.obj video\hq3x32.obj video\hq4x16.obj video\hq4x32.obj gui\gui.obj gui\menu.obj cpu\addrni.obj cpu\dma.obj cpu\dsp.obj cpu\dspproc.obj cpu\execute.obj cpu\irq.obj cpu\memory.obj cpu\spc700.obj cpu\stable.obj cpu\table.obj cpu\tableb.obj cpu\tablec.obj chips\dsp1emu.obj chips\fxemu2.obj chips\fxemu2b.obj chips\fxemu2c.obj chips\fxtable.obj chips\sa1proc.obj chips\sa1regs.obj chips\sfxproc.obj chips\st10proc.obj chips\seta10.obj zip\unzip.obj zip\zpng.obj jma\7zlzma.obj jma\aribitcd.obj jma\crc32.obj jma\iiostrm.obj jma\inbyte.obj jma\jma.obj jma\lzmadec.obj ma\lzma.obj jma\outbyte.obj jma\winout.obj jma\zsnesjma.obj zlib.lib libpng.lib wsock32.lib user32.lib gdi32.lib shell32.lib winmm.lib ddraw.lib dsound.lib dinput8.lib d3dx.lib /link /section:.text,erw +/Fezsnesw.exe chips\dsp1proc.obj chips\dsp2proc.obj dos\sw.obj dos\gppro.obj dos\vesa12.obj dos\zsipx.obj dos\modemrtn.obj dos\joy.obj dos\debug.obj dos\vesa2.obj dos\initvid.obj cfgload.obj endmem.obj init.obj initc.obj uic.obj patch.obj ui.obj vcache.obj effects\water.obj effects\smoke.obj effects\burn.obj version.obj video\procvid.obj win\copyvwin.obj win\winintrf.obj win\winlink.obj win\zloaderw.obj win\ztcp.obj win\zfilew.obj win\zipxw.obj video\makev16b.obj video\makev16t.obj video\makevid.obj video\mode716.obj video\mode716b.obj video\mode716d.obj video\mode716e.obj video\mode716t.obj video\mode7.obj video\mode7ext.obj video\mv16tms.obj video\newg162.obj video\newgfx16.obj video\newgfx2.obj video\newgfx.obj video\m716text.obj video\2xsaiw.obj video\sw_draw.obj video\hq2x16.obj video\hq2x32.obj video\hq3x16.obj video\hq3x32.obj video\hq4x16.obj video\hq4x32.obj gui\gui.obj gui\menu.obj cpu\addrni.obj cpu\dma.obj cpu\dsp.obj cpu\dspproc.obj cpu\execute.obj cpu\irq.obj cpu\memory.obj cpu\spc700.obj cpu\stable.obj cpu\table.obj cpu\tableb.obj cpu\tablec.obj chips\dsp1emu.obj chips\fxemu2.obj chips\fxemu2b.obj chips\fxemu2c.obj chips\fxtable.obj chips\sa1proc.obj chips\sa1regs.obj chips\sfxproc.obj chips\st10proc.obj chips\seta10.obj zip\unzip.obj zip\zpng.obj jma\7zlzma.obj jma\crc32.obj jma\iiostrm.obj jma\inbyte.obj jma\jma.obj jma\lzmadec.obj ma\lzma.obj jma\winout.obj jma\zsnesjma.obj zlib.lib libpng.lib wsock32.lib user32.lib gdi32.lib shell32.lib winmm.lib ddraw.lib dsound.lib dinput8.lib d3dx.lib /link /section:.text,erw diff --git a/zsnes/src/makefile.dos b/zsnes/src/makefile.dos index 2939134d..3c31467c 100644 --- a/zsnes/src/makefile.dos +++ b/zsnes/src/makefile.dos @@ -27,32 +27,32 @@ EFFECTSDIR=effects JMADIR=jma CHIPSOBJ=${CHIPDIR}/dsp1emu.o ${CHIPDIR}/fxemu2.o ${CHIPDIR}/sfxproc.o\ - ${CHIPDIR}/fxemu2b.o ${CHIPDIR}/fxemu2c.o ${CHIPDIR}/fxtable.o\ + ${CHIPDIR}/fxemu2b.o ${CHIPDIR}/fxemu2c.o ${CHIPDIR}/fxtable.o\ ${CHIPDIR}/sa1proc.o ${CHIPDIR}/sa1regs.o ${CHIPDIR}/dsp1proc.o\ ${CHIPDIR}/st10proc.o ${CHIPDIR}/seta10.o ${CHIPDIR}/dsp2proc.o CPUOBJ=${CPUDIR}/addrni.o ${CPUDIR}/dma.o ${CPUDIR}/dsp.o ${CPUDIR}/dspproc.o\ - ${CPUDIR}/execute.o ${CPUDIR}/irq.o ${CPUDIR}/memory.o\ - ${CPUDIR}/spc700.o ${CPUDIR}/stable.o ${CPUDIR}/table.o\ - ${CPUDIR}/tableb.o ${CPUDIR}/tablec.o + ${CPUDIR}/execute.o ${CPUDIR}/irq.o ${CPUDIR}/memory.o\ + ${CPUDIR}/spc700.o ${CPUDIR}/stable.o ${CPUDIR}/table.o\ + ${CPUDIR}/tableb.o ${CPUDIR}/tablec.o GUIOBJ=${GUIDIR}/gui.o ${GUIDIR}/menu.o VIDEOBJ=${VIDEODIR}/makev16b.o ${VIDEODIR}/makev16t.o ${VIDEODIR}/makevid.o\ - ${VIDEODIR}/mode716.o ${VIDEODIR}/mode716b.o ${VIDEODIR}/mode716d.o\ - ${VIDEODIR}/mode716e.o ${VIDEODIR}/mode716t.o ${VIDEODIR}/mode7.o\ - ${VIDEODIR}/mode7ext.o ${VIDEODIR}/mv16tms.o ${VIDEODIR}/newg162.o\ - ${VIDEODIR}/newgfx16.o ${VIDEODIR}/newgfx2.o ${VIDEODIR}/newgfx.o\ - ${VIDEODIR}/m716text.o ${VIDEODIR}/procvid.o + ${VIDEODIR}/mode716.o ${VIDEODIR}/mode716b.o ${VIDEODIR}/mode716d.o\ + ${VIDEODIR}/mode716e.o ${VIDEODIR}/mode716t.o ${VIDEODIR}/mode7.o\ + ${VIDEODIR}/mode7ext.o ${VIDEODIR}/mv16tms.o ${VIDEODIR}/newg162.o\ + ${VIDEODIR}/newgfx16.o ${VIDEODIR}/newgfx2.o ${VIDEODIR}/newgfx.o\ + ${VIDEODIR}/m716text.o ${VIDEODIR}/procvid.o DOSOBJ= ${DOSDIR}/dosintrf.o ${DOSDIR}/gppro.o ${DOSDIR}/debug.o\ - ${DOSDIR}/initvid.o ${DOSDIR}/modemrtn.o ${DOSDIR}/sw32.o\ - ${DOSDIR}/joy.o ${DOSDIR}/sound.o ${DOSDIR}/sw.o ${DOSDIR}/vesa12.o\ - ${DOSDIR}/vesa2.o ${DOSDIR}/zloader.o ${DOSDIR}/zsipx.o\ - ${DOSDIR}/zfile.o + ${DOSDIR}/initvid.o ${DOSDIR}/modemrtn.o ${DOSDIR}/sw32.o\ + ${DOSDIR}/joy.o ${DOSDIR}/sound.o ${DOSDIR}/sw.o ${DOSDIR}/vesa12.o\ + ${DOSDIR}/vesa2.o ${DOSDIR}/zloader.o ${DOSDIR}/zsipx.o\ + ${DOSDIR}/zfile.o WINOBJ=${WINDIR}/copywin.o ${WINDIR}/winintrf.o ${WINDIR}/winlink.o\ - ${WINDIR}/zloaderw.o ${WINDIR}/ztcp.o ${WINDIR}/zipxw.o + ${WINDIR}/zloaderw.o ${WINDIR}/ztcp.o ${WINDIR}/zipxw.o PREOBJ=${OBJDIR}/dosbuff.o ${OBJDIR}/ipx.o ${OBJDIR}/zipx.o @@ -60,9 +60,9 @@ ZIPOBJ=${ZIPDIR}/unzip.o ${ZIPDIR}/zpng.o EFFECTSOBJ=${EFFECTSDIR}/burn.o ${EFFECTSDIR}/water.o ${EFFECTSDIR}/smoke.o -JMAOBJ=${JMADIR}/7zlzma.o ${JMADIR}/aribitcd.o ${JMADIR}/crc32.o ${JMADIR}/iiostrm.o\ +JMAOBJ=${JMADIR}/7zlzma.o ${JMADIR}/crc32.o ${JMADIR}/iiostrm.o\ ${JMADIR}/inbyte.o ${JMADIR}/jma.o ${JMADIR}/lzma.o ${JMADIR}/lzmadec.o\ - ${JMADIR}/outbyte.o ${JMADIR}/winout.o ${JMADIR}/zsnesjma.o + ${JMADIR}/winout.o ${JMADIR}/zsnesjma.o MAINOBJ=cfgload.o endmem.o init.o initc.o uic.o patch.o ui.o vcache.o version.o @@ -80,23 +80,23 @@ PP=gpp .SUFFIXES: .c .cpp .asm %.o: %.c - ${CC} ${CFLAGS} -o $@ -c $< + ${CC} ${CFLAGS} -o $@ -c $< %.o: %.cpp - ${PP} ${CFLAGS} -o $@ -c $< + ${PP} ${CFLAGS} -o $@ -c $< %.o: %.asm - ${ASM} ${ASMFLAGS} -o $@ $< + ${ASM} ${ASMFLAGS} -o $@ $< ALL: zsnes.exe debug: zsnesd.exe zsnes.exe: ${OBJS} - ${CC} -Ws -s -o zsnes.exe ${OBJS} ${LIBS} + ${CC} -Ws -s -o zsnes.exe ${OBJS} ${LIBS} zsnesd.exe: ${OBJS} - ${CC} -Ws -o zsnesd.exe ${OBJS} ${LIBS} + ${CC} -Ws -o zsnesd.exe ${OBJS} ${LIBS} ${DOSDIR}/zloader.o: ${DOSDIR}/zloader.c @@ -109,9 +109,9 @@ ${ZIPDIR}/zpng.o: ${ZIPDIR}/zpng.c ${ZIPDIR}/zpng.h ${VIDEODIR}/procvid.o: ${VIDEODIR}/procvid.asm macros.mac ${VIDEODIR}/copyvid.inc ${VIDEODIR}/2xSaImmx.inc ${CHIPDIR}/dsp1proc.o: ${CHIPDIR}/dsp1proc.asm macros.mac ${CHIPDIR}/sa1regs.o: ${CHIPDIR}/sa1regs.asm macros.mac\ - ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac + ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac ${CHIPDIR}/sfxproc.o: ${CHIPDIR}/sfxproc.asm macros.mac\ - ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac + ${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac ${CHIPDIR}/dsp1emu.o: ${CHIPDIR}/dsp1emu.c ${CHIPDIR}/st10proc.o: ${CHIPDIR}/st10proc.asm ${CHIPDIR}/seta10.o: ${CHIPDIR}/seta10.c @@ -123,79 +123,79 @@ uic.o:uic.c patch.o:patch.c ALL: - del version.o + del version.o version.o:version.c ${DOSDIR}/debug.o: ${DOSDIR}/debug.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}/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}/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}/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}/saddress.inc ${CPUDIR}/saddrni.inc ${CPUDIR}/se65816.inc\ + macros.mac ${CPUDIR}/memory.o: ${CPUDIR}/memory.asm macros.mac ${CPUDIR}/dma.o: ${CPUDIR}/dma.asm macros.mac ${DOSDIR}/dosintrf.o: ${DOSDIR}/dosintrf.asm macros.mac vcache.o:vcache.asm macros.mac ${DOSDIR}/initvid.o:${DOSDIR}/initvid.asm macros.mac ${DOSDIR}/vga.inc ${VIDEODIR}/makevid.o: ${VIDEODIR}/makevid.asm ${VIDEODIR}/vidmacro.mac\ - macros.mac + macros.mac ${VIDEODIR}/makev16b.o: ${VIDEODIR}/makev16b.asm ${VIDEODIR}/vidmacro.mac\ - macros.mac + macros.mac ${VIDEODIR}/makev16t.o: ${VIDEODIR}/makev16t.asm ${VIDEODIR}/vidmacro.mac\ - macros.mac + macros.mac ${VIDEODIR}/mv16tms.o: ${VIDEODIR}/mv16tms.asm ${VIDEODIR}/vidmacro.mac\ - macros.mac + macros.mac ${VIDEODIR}/mode7.o: ${VIDEODIR}/mode7.asm ${VIDEODIR}/mode7.mac\ - macros.mac + macros.mac ${VIDEODIR}/mode716.o: ${VIDEODIR}/mode716.asm ${VIDEODIR}/mode716.mac\ - macros.mac + macros.mac ${VIDEODIR}/mode716b.o:${VIDEODIR}/mode716b.asm ${VIDEODIR}/mode7.mac\ - macros.mac + macros.mac ${VIDEODIR}/mode716t.o:${VIDEODIR}/mode716t.asm ${VIDEODIR}/mode7.mac\ - macros.mac + macros.mac ${VIDEODIR}/mode716d.o:${VIDEODIR}/mode716d.asm ${VIDEODIR}/mode7.mac\ - macros.mac + macros.mac ${VIDEODIR}/mode7ext.o:${VIDEODIR}/mode7ext.asm macros.mac ${VIDEODIR}/mode716e.o:${VIDEODIR}/mode716e.asm macros.mac ${VIDEODIR}/m716text.o:${VIDEODIR}/m716text.asm ${VIDEODIR}/mode7.mac\ - macros.mac + 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}/regsw.mac ${CPUDIR}/spcdef.inc ${CPUDIR}/spcaddr.inc ${CPUDIR}/dsp.o: ${CPUDIR}/dsp.asm macros.mac ${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}/sw.o: ${DOSDIR}/sw.asm macros.mac ${GUIDIR}/gui.o: ${GUIDIR}/gui.asm ${GUIDIR}/guitools.inc\ - ${GUIDIR}/guimisc.inc ${GUIDIR}/guimouse.inc ${GUIDIR}/guiwindp.inc\ - ${GUIDIR}/guinetpl.inc ${GUIDIR}/guikeys.inc ${GUIDIR}/guicheat.inc\ - ${GUIDIR}/guicombo.inc ${GUIDIR}/guiload.inc macros.mac + ${GUIDIR}/guimisc.inc ${GUIDIR}/guimouse.inc ${GUIDIR}/guiwindp.inc\ + ${GUIDIR}/guinetpl.inc ${GUIDIR}/guikeys.inc ${GUIDIR}/guicheat.inc\ + ${GUIDIR}/guicombo.inc ${GUIDIR}/guiload.inc macros.mac ${GUIDIR}/menu.o: ${GUIDIR}/menu.asm macros.mac ${VIDEODIR}/newgfx.o:${VIDEODIR}/newgfx.asm ${VIDEODIR}/vidmacro.mac\ - ${VIDEODIR}/newgfx2.mac ${VIDEODIR}/newgfx.mac macros.mac + ${VIDEODIR}/newgfx2.mac ${VIDEODIR}/newgfx.mac macros.mac ${VIDEODIR}/newgfx2.o:${VIDEODIR}/newgfx2.asm ${VIDEODIR}/newgfxwn.mac\ - ${VIDEODIR}/newgfx.mac macros.mac + ${VIDEODIR}/newgfx.mac macros.mac ${VIDEODIR}/newgfx16.o: ${VIDEODIR}/newgfx16.asm macros.mac ${VIDEODIR}/vidmacro.mac\ - ${VIDEODIR}/newgfx16.mac ${VIDEODIR}/newg162.mac + ${VIDEODIR}/newgfx16.mac ${VIDEODIR}/newg162.mac ${VIDEODIR}/newg162.o: macros.mac ${VIDEODIR}/newg162.asm ${VIDEODIR}/newg162.mac\ - ${VIDEODIR}/vidmacro.mac ${VIDEODIR}/newg16wn.mac + ${VIDEODIR}/vidmacro.mac ${VIDEODIR}/newg16wn.mac ${CHIPDIR}/fxemu2.o: ${CHIPDIR}/fxemu2.asm ${CHIPDIR}/fxemu2.mac\ - macros.mac + macros.mac ${CHIPSDIR}/fxemu2b.o: ${CHIPDIR}/fxemu2b.asm ${CHIPDIR}/fxemu2.mac\ - ${CHIPDIR}/fxemu2b.mac + ${CHIPDIR}/fxemu2b.mac ${CHIPSDIR}/fxemu2c.o: ${CHIPDIR}/fxemu2c.asm macros.mac ${CHIPDIR}/fxemu2.mac\ - ${CHIPDIR}/fxemu2b.mac ${CHIPDIR}/fxemu2c.mac + ${CHIPDIR}/fxemu2b.mac ${CHIPDIR}/fxemu2c.mac ${CHIPDIR}/fxtable.o: ${CHIPDIR}/fxtable.asm macros.mac ${DOSDIR}/gppro.o: ${DOSDIR}/gppro.asm macros.mac ${DOSDIR}/zsipx.o: ${DOSDIR}/zsipx.asm @@ -204,28 +204,26 @@ endmem.o: endmem.asm macros.mac ${DOSDIR}/modemrtn.o: ${DOSDIR}/modemrtn.asm macros.mac ${JMADIR}/7zlzma.o: ${JMADIR}/7zlzma.cpp -${JMADIR}/aribitcd.o: ${JMADIR}/aribitcd.cpp ${JMADIR}/crc32.o: ${JMADIR}/crc32.cpp ${JMADIR}/crc32.h ${JMADIR}/iiostrm.o: ${JMADIR}/iiostrm.cpp ${JMADIR}/inbyte.o: ${JMADIR}/inbyte.cpp ${JMADIR}/jma.o: ${JMADIR}/jma.cpp ${JMADIR}/jma.h ${JMADIR}/crc32.h ${JMADIR}/portable.h ${JMADIR}/lzma.o: ${JMADIR}/lzma.cpp ${JMADIR}/lzmadec.o: ${JMADIR}/lzmadec.cpp -${JMADIR}/outbyte.o: ${JMADIR}/outbyte.cpp ${JMADIR}/winout.o: ${JMADIR}/winout.cpp ${JMADIR}/zsnesjma.o: ${JMADIR}/zsnesjma.cpp ${JMADIR}/zsnesjma.h ${JMADIR}/jma.h clean: - del *.o - del ${CHIPDIR}\*.o - del ${CPUDIR}\*.o - del ${VIDEODIR}\*.o - del ${GUIDIR}\*.o - del ${DOSDIR}\*.o - del ${ZIPDIR}\*.o - del ${EFFECTSDIR}\*.o - del ${JMADIR}\*.o - del zsnes.exe + del *.o + del ${CHIPDIR}\*.o + del ${CPUDIR}\*.o + del ${VIDEODIR}\*.o + del ${GUIDIR}\*.o + del ${DOSDIR}\*.o + del ${ZIPDIR}\*.o + del ${EFFECTSDIR}\*.o + del ${JMADIR}\*.o + del zsnes.exe diff --git a/zsnes/src/makefile.win b/zsnes/src/makefile.win index 64afaad4..a7e7e1b4 100644 --- a/zsnes/src/makefile.win +++ b/zsnes/src/makefile.win @@ -35,39 +35,39 @@ EFFECTSDIR=effects JMADIR=jma CHIPSOBJ=${CHIPDIR}/sfxproc.obj ${CHIPDIR}/fxemu2.obj ${CHIPDIR}/dsp1proc.obj\ - ${CHIPDIR}/fxemu2b.obj ${CHIPDIR}/fxemu2c.obj ${CHIPDIR}/fxtable.obj\ - ${CHIPDIR}/sa1proc.obj ${CHIPDIR}/sa1regs.obj ${CHIPDIR}/dsp1emu.obj\ + ${CHIPDIR}/fxemu2b.obj ${CHIPDIR}/fxemu2c.obj ${CHIPDIR}/fxtable.obj\ + ${CHIPDIR}/sa1proc.obj ${CHIPDIR}/sa1regs.obj ${CHIPDIR}/dsp1emu.obj\ ${CHIPDIR}/st10proc.obj ${CHIPDIR}/seta10.obj ${CHIPDIR}/dsp2proc.obj CPUOBJ=${CPUDIR}/addrni.obj ${CPUDIR}/dma.obj ${CPUDIR}/dsp.obj ${CPUDIR}/dspproc.obj\ - ${CPUDIR}/execute.obj ${CPUDIR}/irq.obj ${CPUDIR}/memory.obj\ - ${CPUDIR}/spc700.obj ${CPUDIR}/stable.obj ${CPUDIR}/table.obj\ - ${CPUDIR}/tableb.obj ${CPUDIR}/tablec.obj + ${CPUDIR}/execute.obj ${CPUDIR}/irq.obj ${CPUDIR}/memory.obj\ + ${CPUDIR}/spc700.obj ${CPUDIR}/stable.obj ${CPUDIR}/table.obj\ + ${CPUDIR}/tableb.obj ${CPUDIR}/tablec.obj GUIOBJ=${GUIDIR}/gui.obj ${GUIDIR}/menu.obj VIDEOBJ=${VIDEODIR}/makev16b.obj ${VIDEODIR}/makev16t.obj ${VIDEODIR}/makevid.obj\ - ${VIDEODIR}/mode716.obj ${VIDEODIR}/mode716b.obj ${VIDEODIR}/mode716d.obj\ - ${VIDEODIR}/mode716e.obj ${VIDEODIR}/mode716t.obj ${VIDEODIR}/mode7.obj\ - ${VIDEODIR}/mode7ext.obj ${VIDEODIR}/mv16tms.obj ${VIDEODIR}/newg162.obj\ - ${VIDEODIR}/newgfx16.obj ${VIDEODIR}/newgfx2.obj ${VIDEODIR}/newgfx.obj\ + ${VIDEODIR}/mode716.obj ${VIDEODIR}/mode716b.obj ${VIDEODIR}/mode716d.obj\ + ${VIDEODIR}/mode716e.obj ${VIDEODIR}/mode716t.obj ${VIDEODIR}/mode7.obj\ + ${VIDEODIR}/mode7ext.obj ${VIDEODIR}/mv16tms.obj ${VIDEODIR}/newg162.obj\ + ${VIDEODIR}/newgfx16.obj ${VIDEODIR}/newgfx2.obj ${VIDEODIR}/newgfx.obj\ ${VIDEODIR}/m716text.obj ${VIDEODIR}/2xsaiw.obj\ - ${VIDEODIR}/procvid.obj ${VIDEODIR}/sw_draw.obj\ + ${VIDEODIR}/procvid.obj ${VIDEODIR}/sw_draw.obj\ ${VIDEODIR}/hq2x16.obj ${VIDEODIR}/hq2x32.obj\ ${VIDEODIR}/hq3x16.obj ${VIDEODIR}/hq3x32.obj\ ${VIDEODIR}/hq4x16.obj ${VIDEODIR}/hq4x32.obj WINOBJ=${WINDIR}/copyvwin.obj \ - ${WINDIR}/winintrf.obj ${WINDIR}/winlink.obj ${WINDIR}/zloaderw.obj\ - ${WINDIR}/ztcp.obj ${WINDIR}/zipxw.obj ${WINDIR}/zfilew.obj + ${WINDIR}/winintrf.obj ${WINDIR}/winlink.obj ${WINDIR}/zloaderw.obj\ + ${WINDIR}/ztcp.obj ${WINDIR}/zipxw.obj ${WINDIR}/zfilew.obj WINDOSOBJ=${DOSDIR}/debug.obj ${DOSDIR}/joy.obj ${DOSDIR}/modemrtn.obj ${DOSDIR}/vesa2.obj\ - ${DOSDIR}/initvid.obj ${DOSDIR}/sw.obj ${DOSDIR}/gppro.obj ${DOSDIR}/vesa12.obj\ + ${DOSDIR}/initvid.obj ${DOSDIR}/sw.obj ${DOSDIR}/gppro.obj ${DOSDIR}/vesa12.obj\ ${DOSDIR}/zsipx.obj -JMAOBJ=${JMADIR}/7zlzma.obj ${JMADIR}/aribitcd.obj ${JMADIR}/crc32.obj ${JMADIR}/iiostrm.obj\ +JMAOBJ=${JMADIR}/7zlzma.obj ${JMADIR}/crc32.obj ${JMADIR}/iiostrm.obj\ ${JMADIR}/inbyte.obj ${JMADIR}/jma.obj ${JMADIR}/lzma.obj ${JMADIR}/lzmadec.obj\ - ${JMADIR}/outbyte.obj ${JMADIR}/winout.obj ${JMADIR}/zsnesjma.obj + ${JMADIR}/winout.obj ${JMADIR}/zsnesjma.obj PREOBJ= ZIPOBJ=${ZIPDIR}/unzip.obj ${ZIPDIR}/zpng.obj @@ -85,23 +85,23 @@ ASMFLAGS=-O1 -f win32 -D__WIN32__ CC=cl .SUFFIXES: .c .cpp .asm - + %.obj : %.c - ${CC} ${CFLAGS} /Fo$@ $< + ${CC} ${CFLAGS} /Fo$@ $< %.obj: %.cpp - ${CC} ${CFLAGS} /Fo$@ $< + ${CC} ${CFLAGS} /Fo$@ $< %.obj: %.asm - ${ASM} ${ASMFLAGS} -o $@ $< + ${ASM} ${ASMFLAGS} -o $@ $< ALL: zsnesw.exe zsnesw.exe: ${OBJS} ${WINDIR}/zsnes.res - cl @link.win32 ${WINDIR}/zsnes.res /link /libpath:${DXDIR}\lib + cl @link.win32 ${WINDIR}/zsnes.res /link /libpath:${DXDIR}\lib ${WINDIR}/zsnes.res: ${WINDIR}/zsnes.rc - rc ${WINDIR}/zsnes.rc + rc ${WINDIR}/zsnes.rc ${WINDIR}/copyvwin.obj: ${WINDIR}/copyvwin.asm macros.mac ${WINDIR}/winintrf.obj: ${WINDIR}/winintrf.asm macros.mac ${WINDIR}/zfilew.obj: ${WINDIR}/zfilew.c @@ -156,73 +156,73 @@ ${DOSDIR}/debug.obj: ${DOSDIR}/debug.asm macros.mac ${CPUDIR}/addrni.obj: ${CPUDIR}/addrni.asm ${CPUDIR}/execute.obj: ${CPUDIR}/execute.asm macros.mac ${CPUDIR}/table.obj: ${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}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816.inc\ + ${CPUDIR}/regs.mac ${CPUDIR}/regs.inc ${CPUDIR}/regsw.mac\ + ${CPUDIR}/regsw.inc macros.mac ${CPUDIR}/tableb.obj: ${CPUDIR}/tableb.asm ${CPUDIR}/65816db.inc\ - ${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816b.inc\ - ${CPUDIR}/regs.mac macros.mac + ${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816b.inc\ + ${CPUDIR}/regs.mac macros.mac ${CPUDIR}/tablec.obj: ${CPUDIR}/tablec.asm ${CPUDIR}/65816dc.inc\ - ${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816c.inc\ - ${CPUDIR}/regs.mac macros.mac + ${CPUDIR}/address.inc ${CPUDIR}/addrni.inc ${CPUDIR}/e65816c.inc\ + ${CPUDIR}/regs.mac macros.mac ${CPUDIR}/stable.obj: ${CPUDIR}/stable.asm ${CPUDIR}/s65816d.inc\ - ${CPUDIR}/saddress.inc ${CPUDIR}/saddrni.inc ${CPUDIR}/se65816.inc\ - macros.mac + ${CPUDIR}/saddress.inc ${CPUDIR}/saddrni.inc ${CPUDIR}/se65816.inc\ + macros.mac ${CPUDIR}/memory.obj: ${CPUDIR}/memory.asm macros.mac ${CPUDIR}/dma.obj: ${CPUDIR}/dma.asm macros.mac ${DOSDIR}/dosintrf.obj: ${DOSDIR}/dosintrf.asm macros.mac vcache.obj:vcache.asm macros.mac ${DOSDIR}/initvid.obj:${DOSDIR}/initvid.asm macros.mac ${VIDEODIR}/makevid.obj: ${VIDEODIR}/makevid.asm ${VIDEODIR}/vidmacro.mac\ - macros.mac + macros.mac ${VIDEODIR}/makev16b.obj: ${VIDEODIR}/makev16b.asm ${VIDEODIR}/vidmacro.mac\ - macros.mac + macros.mac ${VIDEODIR}/makev16t.obj: ${VIDEODIR}/makev16t.asm ${VIDEODIR}/vidmacro.mac\ - macros.mac + macros.mac ${VIDEODIR}/mv16tms.obj: ${VIDEODIR}/mv16tms.asm ${VIDEODIR}/vidmacro.mac\ - macros.mac + macros.mac ${VIDEODIR}/mode7.obj: ${VIDEODIR}/mode7.asm ${VIDEODIR}/mode7.mac\ - macros.mac + macros.mac ${VIDEODIR}/mode716.obj: ${VIDEODIR}/mode716.asm ${VIDEODIR}/mode716.mac\ - macros.mac + macros.mac ${VIDEODIR}/mode716b.obj:${VIDEODIR}/mode716b.asm ${VIDEODIR}/mode7.mac\ - macros.mac + macros.mac ${VIDEODIR}/mode716t.obj:${VIDEODIR}/mode716t.asm ${VIDEODIR}/mode7.mac\ - macros.mac + macros.mac ${VIDEODIR}/mode716d.obj:${VIDEODIR}/mode716d.asm ${VIDEODIR}/mode7.mac\ - macros.mac + macros.mac ${VIDEODIR}/mode7ext.obj:${VIDEODIR}/mode7ext.asm macros.mac ${VIDEODIR}/mode716e.obj:${VIDEODIR}/mode716e.asm macros.mac ${VIDEODIR}/m716text.obj:${VIDEODIR}/m716text.asm ${VIDEODIR}/mode7.mac\ - macros.mac + macros.mac ${CPUDIR}/irq.obj: ${CPUDIR}/irq.asm macros.mac ${CPUDIR}/dspproc.obj: ${CPUDIR}/dspproc.asm macros.mac ${CPUDIR}/spc700.obj:${CPUDIR}/spc700.asm macros.mac\ - ${CPUDIR}/regsw.mac ${CPUDIR}/spcdef.inc ${CPUDIR}/spcaddr.inc + ${CPUDIR}/regsw.mac ${CPUDIR}/spcdef.inc ${CPUDIR}/spcaddr.inc ${CPUDIR}/dsp.obj: ${CPUDIR}/dsp.asm macros.mac ${DOSDIR}/vesa2.obj: ${DOSDIR}/vesa2.asm macros.mac ${DOSDIR}/vesa12.obj: ${DOSDIR}/vesa12.asm macros.mac ${DOSDIR}/joy.obj: ${DOSDIR}/joy.asm macros.mac ${DOSDIR}/sw.obj: ${DOSDIR}/sw.asm macros.mac ${GUIDIR}/gui.obj: ${GUIDIR}/gui.asm ${GUIDIR}/guitools.inc\ - ${GUIDIR}/guimisc.inc ${GUIDIR}/guimouse.inc ${GUIDIR}/guiwindp.inc\ - ${GUIDIR}/guinetpl.inc ${GUIDIR}/guikeys.inc ${GUIDIR}/guicheat.inc\ - ${GUIDIR}/guicombo.inc ${GUIDIR}/guiload.inc macros.mac + ${GUIDIR}/guimisc.inc ${GUIDIR}/guimouse.inc ${GUIDIR}/guiwindp.inc\ + ${GUIDIR}/guinetpl.inc ${GUIDIR}/guikeys.inc ${GUIDIR}/guicheat.inc\ + ${GUIDIR}/guicombo.inc ${GUIDIR}/guiload.inc macros.mac ${GUIDIR}/menu.obj: ${GUIDIR}/menu.asm macros.mac ${VIDEODIR}/newgfx.obj:${VIDEODIR}/newgfx.asm ${VIDEODIR}/vidmacro.mac\ - ${VIDEODIR}/newgfx2.mac ${VIDEODIR}/newgfx.mac macros.mac + ${VIDEODIR}/newgfx2.mac ${VIDEODIR}/newgfx.mac macros.mac ${VIDEODIR}/newgfx2.obj:${VIDEODIR}/newgfx2.asm ${VIDEODIR}/newgfxwn.mac\ - ${VIDEODIR}/newgfx.mac macros.mac + ${VIDEODIR}/newgfx.mac macros.mac ${VIDEODIR}/newgfx16.obj: ${VIDEODIR}/newgfx16.asm macros.mac ${VIDEODIR}/vidmacro.mac\ - ${VIDEODIR}/newgfx16.mac ${VIDEODIR}/newg162.mac + ${VIDEODIR}/newgfx16.mac ${VIDEODIR}/newg162.mac ${VIDEODIR}/newg162.obj: macros.mac ${VIDEODIR}/newg162.asm ${VIDEODIR}/newg162.mac\ - ${VIDEODIR}/vidmacro.mac ${VIDEODIR}/newg16wn.mac + ${VIDEODIR}/vidmacro.mac ${VIDEODIR}/newg16wn.mac ${CHIPDIR}/fxemu2.obj: ${CHIPDIR}/fxemu2.asm ${CHIPDIR}/fxemu2.mac\ - macros.mac + macros.mac ${CHIPDIR}/fxemu2b.obj: ${CHIPDIR}/fxemu2b.asm ${CHIPDIR}/fxemu2.mac\ - ${CHIPDIR}/fxemu2b.mac + ${CHIPDIR}/fxemu2b.mac ${CHIPDIR}/fxemu2c.obj: ${CHIPDIR}/fxemu2c.asm macros.mac ${CHIPDIR}/fxemu2.mac\ - ${CHIPDIR}/fxemu2b.mac ${CHIPDIR}/fxemu2c.mac + ${CHIPDIR}/fxemu2b.mac ${CHIPDIR}/fxemu2c.mac ${CHIPDIR}/fxtable.obj: ${CHIPDIR}/fxtable.asm macros.mac ${DOSDIR}/gppro.obj: ${DOSDIR}/gppro.asm macros.mac ${DOSDIR}/zsipx.obj: ${DOSDIR}/zsipx.asm @@ -231,31 +231,29 @@ endmem.obj: endmem.asm macros.mac ${DOSDIR}/modemrtn.obj: ${DOSDIR}/modemrtn.asm macros.mac ${JMADIR}/7zlzma.obj: ${JMADIR}/7zlzma.cpp -${JMADIR}/aribitcd.obj: ${JMADIR}/aribitcd.cpp ${JMADIR}/crc32.obj: ${JMADIR}/crc32.cpp ${JMADIR}/crc32.h ${JMADIR}/iiostrm.obj: ${JMADIR}/iiostrm.cpp ${JMADIR}/inbyte.obj: ${JMADIR}/inbyte.cpp ${JMADIR}/jma.obj: ${JMADIR}/jma.cpp ${JMADIR}/jma.h ${JMADIR}/crc32.h ${JMADIR}/portable.h ${JMADIR}/lzma.obj: ${JMADIR}/lzma.cpp ${JMADIR}/lzmadec.obj: ${JMADIR}/lzmadec.cpp -${JMADIR}/outbyte.obj: ${JMADIR}/outbyte.cpp ${JMADIR}/winout.obj: ${JMADIR}/winout.cpp ${JMADIR}/zsnesjma.obj: ${JMADIR}/zsnesjma.cpp ${JMADIR}/zsnesjma.h ${JMADIR}/jma.h clean: - del *.obj - del ${CHIPDIR}\*.obj - del ${CPUDIR}\*.obj - del ${VIDEODIR}\*.obj - del ${GUIDIR}\*.obj - del ${WINDIR}\*.obj - del ${WINDIR}\zsnes.res - del ${ZIPDIR}\*.obj - del ${DOSDIR}\*.obj - del ${EFFECTSDIR}\*.obj - del ${JMADIR}\*.obj - del zsnesw.exe - + del *.obj + del ${CHIPDIR}\*.obj + del ${CPUDIR}\*.obj + del ${VIDEODIR}\*.obj + del ${GUIDIR}\*.obj + del ${WINDIR}\*.obj + del ${WINDIR}\zsnes.res + del ${ZIPDIR}\*.obj + del ${DOSDIR}\*.obj + del ${EFFECTSDIR}\*.obj + del ${JMADIR}\*.obj + del zsnesw.exe +