*** empty log message ***

zsnes/ChangeLog

@@ -0,0 +1,7 @@
+04/04/2001  Erik Bourget <ebourg@po-box.mcgill.ca>
+	* made it compile cleanly up to linking on unix machines
+	  (fixed up some filename case problems, backslash->forward 
+	   slash issues)
+	* i don't know if this will break DOS stuff.  I assume it won't
+	  because some files asked for include files with the forward
+	  slash.

zsnes/src/chips/sa1regs.asm

@@ -52,14 +52,8 @@ EXTSYM curypos,CurrentExecSA1
 EXTSYM debstop3
 EXTSYM memaccessbankr8sdd1,memtabler8,AddrNoIncr
 
-%include "cpu\regs.mac"
+%include "cpu/regs.mac"
-%include "cpu\regsw.mac"
+%include "cpu/regsw.mac"
-
-
-
-
-
-
 
 
 ALIGN32

zsnes/src/chips/sfxproc.asm

@@ -25,12 +25,8 @@ EXTSYM SfxSignZero,SfxnRamBanks,StartSFX,regptr,regptw,sfxramdata,ChangeOps
 EXTSYM SfxPOR,sfxclineloc,UpdatePORSCMR,UpdateCLSR,UpdateSCBRCOLR,SfxAC
 EXTSYM sfx128lineloc,sfx160lineloc,sfx192lineloc,sfxobjlineloc,SFXProc
 
-%include "cpu\regs.mac"
+%include "cpu/regs.mac"
-%include "cpu\regsw.mac"
+%include "cpu/regsw.mac"
-
-
-
-
 
 
 %macro AssembleSFXFlags 0

zsnes/src/gui/gui.asm

@@ -172,18 +172,15 @@ EXTSYM ModemSendChar
 
 
 
-
 %include "gui/guitools.inc"
-%include "gui/GUIMisc.inc"
+%include "gui/guimisc.inc"
-%include "gui/GUIMouse.inc"
+%include "gui/guimouse.inc"
-%include "gui/GUIWinDp.inc"
+%include "gui/guiwindp.inc"
 %include "gui/guinetpl.inc"
-%include "gui/GUIKeys.inc"
+%include "gui/guikeys.inc"
-%include "gui/GUICheat.inc"
+%include "gui/guicheat.inc"
-%include "gui/GUICombo.inc"
+%include "gui/guicombo.inc"
-%include "gui/GUILoad.inc"
+%include "gui/guiload.inc"
-
-
 
 
 

zsnes/src/makefile.linux

@@ -0,0 +1,185 @@
+#Copyright (C) 1997-2001 ZSNES Team ( zsknight@zsnes.com / _demo_@zsnes.com )
+#
+#This program is free software; you can redistribute it and/or
+#modify it under the terms of the GNU General Public License
+#as published by the Free Software Foundation; either
+#version 2 of the License, or (at your option) any later
+#version.
+#
+#This program 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 General Public License for more details.
+#
+#You should have received a copy of the GNU General Public License
+#along with this program; if not, write to the Free Software
+#Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+CHIPDIR=chips
+CPUDIR=cpu
+DOSDIR=dos
+GUIDIR=gui
+VIDEODIR=video
+WINDIR=win
+OBJDIR=obj
+
+CHIPSOBJ=${CHIPDIR}/dsp1emu.o ${CHIPDIR}/fxemu2.o ${CHIPDIR}/sfxproc.o\
+	${CHIPDIR}/fxemu2b.o ${CHIPDIR}/fxemu2c.o ${CHIPDIR}/fxtable.o\
+	${CHIPDIR}/sa1proc.o ${CHIPDIR}/sa1regs.o ${CHIPDIR}/dsp1proc.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 
+
+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}/2xsai.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}/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
+
+PREOBJ=
+
+MAINOBJ=cfgload.o endmem.o fixsin.o init.o ui.o vcache.o water.o
+
+
+OBJS=${CHIPSOBJ} ${CPUOBJ} ${DOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${PREOBJ} ${MAINOBJ}
+LIBS=-lz -lgcc -lm
+CFLAGS=
+ASM=nasm
+ASMFLAGS=-f elf
+CC=gcc
+PP=g++
+
+
+.SUFFIXES: .c .cpp .asm 
+
+%.o: %.c
+	${CC} ${CFLAGS} -o $@ -c $<
+
+%.o: %.cpp
+	${PP} ${CFLAGS} -o $@ -c $<
+
+%.o: %.asm
+	${ASM} ${ASMFLAGS} -o $@ $<
+
+
+ALL: zsnes
+
+zsnes: ${OBJS}
+	${CC} -Ws -s -o zsnes ${OBJS}  ${LIBS}
+
+${DOSDIR}/zloader.o: ${DOSDIR}/zloader.c
+fixsin.o: fixsin.c
+water.o: water.c
+${DOSDIR}/zfile.o: ${DOSDIR}/zfile.c
+${VIDEODIR}/2xsai.o: ${VIDEODIR}/2xsai.cpp
+${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
+${CHIPDIR}/sfxproc.o: ${CHIPDIR}/sfxproc.asm macros.mac\
+	${CPUDIR}/regs.mac ${CPUDIR}/regsw.mac
+
+${CHIPDIR}/dsp1emu.o: ${CHIPDIR}/dsp1emu.c betauser.mac
+ui.o: ui.asm macros.mac betauser.mac
+cfgload.o:cfgload.asm macros.mac
+init.o:init.asm macros.mac
+${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}/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}/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
+${VIDEODIR}/makevid.o: ${VIDEODIR}/makevid.asm ${VIDEODIR}/vidmacro.mac\
+	macros.mac
+${VIDEODIR}/makev16b.o: ${VIDEODIR}/makev16b.asm ${VIDEODIR}/vidmacro.mac\
+	macros.mac
+${VIDEODIR}/makev16t.o: ${VIDEODIR}/makev16t.asm ${VIDEODIR}/vidmacro.mac\
+	macros.mac
+${VIDEODIR}/mv16tms.o: ${VIDEODIR}/mv16tms.asm ${VIDEODIR}/vidmacro.mac\
+	macros.mac
+${VIDEODIR}/mode7.o: ${VIDEODIR}/mode7.asm ${VIDEODIR}/mode7.mac\
+	macros.mac
+${VIDEODIR}/mode716.o: ${VIDEODIR}/mode716.asm ${VIDEODIR}/mode716.mac\
+	macros.mac
+${VIDEODIR}/mode716b.o:${VIDEODIR}/mode716b.asm ${VIDEODIR}/mode7.mac\
+	macros.mac
+${VIDEODIR}/mode716t.o:${VIDEODIR}/mode716t.asm ${VIDEODIR}/mode7.mac\
+	macros.mac
+${VIDEODIR}/mode716d.o:${VIDEODIR}/mode716d.asm ${VIDEODIR}/mode7.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
+${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
+${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}/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.o:${VIDEODIR}/newgfx2.asm ${VIDEODIR}/newgfxwn.mac\
+	${VIDEODIR}/newgfx.mac macros.mac
+${VIDEODIR}/newgfx16.o: ${VIDEODIR}/newgfx16.asm macros.mac ${VIDEODIR}/vidmacro.mac\
+	${VIDEODIR}/newgfx16.mac ${VIDEODIR}/newg162.mac
+${VIDEODIR}/newg162.o: macros.mac ${VIDEODIR}/newg162.asm ${VIDEODIR}/newg162.mac\
+	${VIDEODIR}/vidmacro.mac ${VIDEODIR}/newg16wn.mac
+${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
+${DOSDIR}/gppro.o: ${DOSDIR}/gppro.asm macros.mac
+${DOSDIR}/zsipx.o: ${DOSDIR}/zsipx.asm
+${CHIPDIR}/sa1proc.o: ${CHIPDIR}/sa1proc.asm macros.mac
+endmem.o: endmem.asm macros.mac
+${DOSDIR}/modemrtn.o: ${DOSDIR}/modemrtn.asm macros.mac
+
+clean:
+	rm *.o
+	rm ${CHIPDIR}/*.o
+	rm ${CPUDIR}/*.o
+	rm ${VIDEODIR}/*.o
+	rm ${GUIDIR}/*.o
+	rm ${DOSDIR}/*.o
+	rm zsnes
+
+

zsnes/src/video/copyvid.inc

@@ -28,7 +28,7 @@ EXTSYM Super2xSaI
 EXTSYM HalfTransB,HalfTransC
 
 
-%include "video/2xSaImmx.inc"
+%include "video/2xsaimmx.inc"