Linux commits

This commit is contained in:
theoddone33
2001-04-10 04:28:44 +00:00
parent 297d98dfc4
commit 42bf44301b
63 changed files with 3057 additions and 2826 deletions

View File

@@ -30,7 +30,7 @@ EXTSYM spcon,vsyncon,Open_File,Read_File
EXTSYM Create_File,Write_File,Close_File
NEWSYM CfgLoadAsmStart
@@ -1871,3 +1871,4 @@ SECTION .data
SECTION .text
NEWSYM CfgLoadAsmEnd

View File

@@ -949,4 +949,3 @@ DSPOp0E()
Log_Message(" X:%d Y:%d",Op0EX,Op0EY);
#endif
}

View File

@@ -36,7 +36,7 @@ EXTSYM Op03X, Op03Y, Op03Z, Op03F, Op03L, Op03U, DSPOp03
EXTSYM Op14Zr, Op14Xr, Op14Yr, Op14U, Op14F, Op14L
EXTSYM Op14Zrr,Op14Xrr,Op14Yrr, DSPOp14
NEWSYM Dsp1ProcAsmStart
@@ -636,3 +636,5 @@ DSP1_14: ; 3D angle rotation
mov byte[DSP1RLeft],3
pop eax
ret
NEWSYM Dsp1ProcAsmEnd

View File

@@ -22,6 +22,8 @@ EXTSYM fxxand,sfx128lineloc,sfx160lineloc,sfx192lineloc,sfxobjlineloc
EXTSYM sfxramdata,fxbit45,fxbit67,SFXProc,ChangeOps
EXTSYM PLOTJmpa,PLOTJmpb
NEWSYM FxEmu2AsmStart
%include "chips/fxemu2.mac"
@@ -117,6 +119,7 @@ NEWSYM SfxB, dd 0 ; B flag (1 when with instruction executed)
NEWSYM SfxOverflow, dd 0 ; Overflow flag
NEWSYM SfxCACHERAM, times 512 db 0 ; 512 bytes of GSU cache memory
SECTION .data
num2writesfxreg equ $-SfxR0
; pharos equ hack *sigh*
NEWSYM PHnum2writesfxreg, dd num2writesfxreg
@@ -2644,6 +2647,7 @@ NEWSYM FxOpFFA2 ; SM (XX),RN store word in RAM
ret
ALIGN32
NEWSYM NumberOfOpcodes, dd 0 ; Number of opcodes to execute
NEWSYM NumberOfOpcodesBU, dd 0 ; Number of opcodes to execute backup value
NEWSYM sfxwarningb, db 0
@@ -2679,4 +2683,6 @@ NEWSYM FXEndLoop
SECTION .data
NEWSYM fxtrace, db 0; times 65536 db 0
SECTION .text
NEWSYM FxEmu2AsmEnd

View File

@@ -20,6 +20,8 @@
EXTSYM FxTable,FxTableb,FxTablec,SfxB,SfxCPB,SfxCROM,SfxCarry,SfxOverflow
EXTSYM SfxR0,SfxR14,SfxR15,SfxRomBuffer,SfxSignZero,withr15sk
NEWSYM FxEmu2BAsmStart
%include "chips/fxemu2.mac"
%include "chips/fxemu2b.mac"
@@ -611,3 +613,5 @@ NEWSYM FxOpcBF ; FROM rn set source register
mov byte[SfxOverflow],al
CLRFLAGS
ret
NEWSYM FxEmu2BAsmEnd

View File

@@ -30,6 +30,8 @@ EXTSYM fxbit01,fxbit23,fxbit45,fxbit67
EXTSYM fxxand
EXTSYM PLOTJmpa,PLOTJmpb
NEWSYM FxEmu2CAsmStart
%include "chips/fxemu2.mac"
%include "chips/fxemu2b.mac"
%include "chips/fxemu2c.mac"
@@ -2548,3 +2550,5 @@ NEWSYM FxOpdFFA2 ; SM (XX),RN store word in RAM
mov [eax+ebx],dh
CLRFLAGS
FXReturn
NEWSYM FxEmu2CAsmEnd

View File

@@ -193,7 +193,7 @@ EXTSYM FxOpd4C1288bl,FxOpd4C1288bzl,FxOpd4C1288bdl,FxOpd4C1288bzdl
EXTSYM fxxand,fxbit01,fxbit23,fxbit45,fxbit67
NEWSYM FxTableAsmStart
@@ -3543,3 +3543,4 @@ NEWSYM sfxnametab
db 'IWT R8 IWT R9 IWT R10 IWT R11 '
db 'IWT R12 IWT R13 IWT R14 IWT R15 '
NEWSYM FxTableAsmEnd

View File

@@ -26,7 +26,7 @@ EXTSYM membank0w8,romdata,SA1LBound,SA1UBound,SA1SH,SA1SHb
EXTSYM stackor,stackand,snesmmap,SA1xs,SA1IRQExec
EXTSYM SA1Message,Sflagnz,Sflagc,Sflago
NEWSYM Sa1ProcAsmStart
@@ -362,3 +362,5 @@ NEWSYM SA1switchtovirq
mov [initaddrl],esi
add esi,eax
ret
NEWSYM Sa1ProcAsmEnd

File diff suppressed because it is too large Load Diff

View File

@@ -25,10 +25,16 @@ EXTSYM SfxSignZero,SfxnRamBanks,StartSFX,regptr,regptw,sfxramdata,ChangeOps
EXTSYM SfxPOR,sfxclineloc,UpdatePORSCMR,UpdateCLSR,UpdateSCBRCOLR,SfxAC
EXTSYM sfx128lineloc,sfx160lineloc,sfx192lineloc,sfxobjlineloc,SFXProc
NEWSYM SfxProcAsmStart
%include "cpu/regs.mac"
%include "cpu/regsw.mac"
%macro AssembleSFXFlags 0
and word[SfxSFR],8F60h
test byte[SfxCarry],1
@@ -663,3 +669,4 @@ NEWSYM sfxaccessbankw16d
xor ebx,ebx
ret
NEWSYM SfxProcAsmEnd

View File

@@ -1628,3 +1628,4 @@ emulRTI
mov word[stackor],0100h
endloop
%endmacro

View File

@@ -17,11 +17,6 @@
;*******************************************************
; Address Modes
;*******************************************************
@@ -405,4 +400,3 @@
.npb
call dword near [memtabler16+ebx*4]
%endmacro

View File

@@ -27,7 +27,7 @@ EXTSYM curhdma,curypos,disablehdma,hdmadata,hdmadelay,hdmaearlstart
EXTSYM resolutn
EXTSYM memtabler16
NEWSYM DmaAsmStart
@@ -1352,3 +1352,4 @@ NEWSYM exechdmars
NEWSYM DmaAsmEnd

View File

@@ -38,6 +38,8 @@ EXTSYM MuteVoiceF,VoiceStarter
EXTSYM DecayRate,SustainRate,SustainValue
EXTSYM KeyOnStA,KeyOnStB,SoundTest
NEWSYM DspAsmStart
%include "betauser.mac"
@@ -3051,3 +3053,4 @@ NEWSYM WDSPRegFF ;
mov [DSPMem+0FFh],al
ret
NEWSYM DspAsmEnd

View File

@@ -131,7 +131,7 @@ EXTSYM cfgecho,Surround,SoundBufEn
EXTSYM echobuf
EXTSYM LowPassFilter
NEWSYM DspProcAsmStart
@@ -2343,7 +2343,6 @@ AdsrBendData db 122,118,114,110,106,102,99,95,92,89,86,83,80,77,74,72,69,67
NEWSYM AdsrSustLevLoc, db 58,39,27,19,13,8,3,1
dspsave equ marksave-BRRBuffer
dspconvb equ marksave-Voice0Freq
NEWSYM PHdspsave, dd dspsave
@@ -5695,3 +5694,4 @@ GetCDMAPos:
ja .loop
.fin
NEWSYM DspProcAsmEnd

View File

@@ -27,7 +27,7 @@ EXTSYM debstop3
NEWSYM E65816IncStart
; B = ( or )
@@ -1992,3 +1992,5 @@ COpFB: ; XCE i
COp42: ; WDM
inc esi
endloop
NEWSYM E65816IncEnd

View File

@@ -114,7 +114,7 @@ EXTSYM fxbit01,fxbit01pcal,fxbit23,fxbit23pcal,fxbit45,fxbit45pcal,fxbit67,fxbit
EXTSYM SfxSFR
EXTSYM cpucycle,debstop,switchtovirqdeb,debstop3,switchtonmideb
NEWSYM ExecuteAsmStart
@@ -4368,6 +4368,4 @@ NEWSYM execsingle
jmp switchtovirqdeb
NEWSYM ExecuteAsmEnd

View File

@@ -26,6 +26,7 @@ EXTSYM irqv8
EXTSYM execloopdeb
EXTSYM nmiv8
NEWSYM IrqAsmStart
@@ -521,3 +522,4 @@ NEWSYM NMIemulmodedeb
add esi,eax
jmp execloopdeb
NEWSYM IrqAsmEnd

View File

@@ -41,7 +41,7 @@ EXTSYM SA1Overflow
EXTSYM Sdd1Mode,Sdd1Bank,Sdd1Addr,Sdd1NewAddr,memtabler8,AddrNoIncr,SDD1BankA
EXTSYM SPC7110Entries,spc7110romptr
NEWSYM MemoryAsmStart
@@ -4403,3 +4403,5 @@ debugdecompress:
call .nomoredec
pop ebx
jmp memaccessbankr8
NEWSYM MemoryAsmEnd

View File

@@ -1096,3 +1096,4 @@ regINVALID: ; Invalid Register
.invalidreg db 'Invalid Read Register : $'

View File

@@ -23,6 +23,8 @@ EXTSYM spc700read
EXTSYM dspWptr
EXTSYM changeexecloop,curexecstate,SA1Enable,tableadb
NEWSYM Spc700AsmStart
%include "cpu/regsw.mac"
%include "cpu/spcdef.inc"
%include "cpu/spcaddr.inc"
@@ -2692,3 +2694,4 @@ NEWSYM Invalidopcode ; Invalid Opcode
dec ebp
ret
NEWSYM Spc700AsmEnd

View File

@@ -21,6 +21,7 @@ EXTSYM SA1tableA,SA1tableB,SA1tableC,SA1tableD,SA1tableE
EXTSYM SA1tableF,SA1tableG,SA1tableH,SA1tablead
EXTSYM cpucycle, SA1UpdateDPage, intrset
NEWSYM StableAsmStart
%include "cpu/s65816d.inc"
%include "cpu/saddress.inc"
%include "cpu/saddrni.inc"
@@ -696,3 +697,4 @@ NEWSYM SA1settableDm16
mov dword[edi+0FFh*4],SA1COpFFm16d
ret
NEWSYM StableAsmEnd

View File

@@ -54,6 +54,7 @@ EXTSYM DPageR8,DPageW8,DPageR16,DPageW16
EXTSYM SDD1Enable
EXTSYM JoyAOrig,JoyANow,JoyBOrig,JoyBNow,JoyCOrig,JoyCNow,JoyDOrig,JoyDNow
NEWSYM TableAsmStart
%include "cpu/65816d.inc"
%include "cpu/address.inc"
%include "cpu/addrni.inc"
@@ -1188,3 +1189,4 @@ NEWSYM settableDm16
mov dword[edi+0FFh*4],COpFFm16d
ret
NEWSYM TableAsmEnd

View File

@@ -30,6 +30,7 @@ EXTSYM sramaccessbankw8,tableAb,tableBb,tableCb,tableDb,tableEb
EXTSYM tableFb,tableGb,tableHb,wramaccessbankr16
EXTSYM wramaccessbankr8,wramaccessbankw16,wramaccessbankw8,tableadb
NEWSYM TableBAsmStart
%include "cpu/65816db.inc"
%include "cpu/address.inc"
%include "cpu/addrni.inc"
@@ -720,3 +721,4 @@ settableDm16:
mov dword[edi+0FFh*4],COpFFm16d
ret
NEWSYM TableBAsmEnd

View File

@@ -30,6 +30,7 @@ EXTSYM sramaccessbankw8,tableAc,tableBc,tableCc,tableDc,tableEc
EXTSYM tableFc,tableGc,tableHc,wramaccessbankr16
EXTSYM wramaccessbankr8,wramaccessbankw16,wramaccessbankw8,tableadc
NEWSYM TableCAsmStart
%include "cpu/65816dc.inc"
%include "cpu/address.inc"
%include "cpu/addrni.inc"
@@ -720,3 +721,4 @@ settableDm16:
mov dword[edi+0FFh*4],COpFFm16d
ret
NEWSYM TableCAsmEnd

View File

@@ -49,7 +49,7 @@ EXTSYM SA1xpb,SA1xpc,SA1xa,SA1xx,SA1xy,SA1xd,SA1xdb,SA1xs
EXTSYM cycpbl,debugbuf,soundon,spcA,spcNZ,spcP,spcPCRam
EXTSYM spcRam,spcRamDP,spcS,spcX,spcY
NEWSYM DebugAsmStart
@@ -3846,3 +3846,5 @@ NEWSYM ArgumentTable
db 00,01,02,03,04,05,06,07,08,24,63,32,30,00,31,00
; F0 F1 F2 F3 F4 F5 F6 F7 F8 F9 FA FB FC FD FE FF
db 14,01,02,03,15,16,17,18,35,64,09,65,31,66,67,00
NEWSYM DebugAsmEnd

View File

@@ -17,6 +17,7 @@
%include "macros.mac"
NEWSYM GPProAsmStart
section .data
sample times 60 db 0
clock_mask db 0
@@ -153,3 +154,4 @@ GPP_ERR:
pop ebx
mov eax,1
ret
NEWSYM GPProAsmEnd

View File

@@ -22,7 +22,7 @@ EXTSYM scanlines,selcA000,vesa2_bits,vesa2_bpos,vesa2_clbit
EXTSYM vesa2_gpos,vesa2_rpos,vesa2_usbit,vesa2_x,vesa2_y
EXTSYM vesa2selec,InitVesa12,videotroub
NEWSYM InitVidAsmStart
@@ -618,3 +618,4 @@ NEWSYM dosinitvideo
pop es
ret
NEWSYM InitVidAsmEnd

View File

@@ -30,6 +30,7 @@ EXTSYM pl5contrl,pl5p209
EXTSYM CalibXmin, CalibYmin, CalibXmax, CalibYmax, CalibXmin209
EXTSYM CalibYmin209, CalibXmax209, CalibYmax209
NEWSYM JoyAsmStart
NEWSYM joy4218, db 0
NEWSYM joy4219, db 0
@@ -1614,3 +1615,4 @@ NEWSYM SetInputDevice209
.exit
ret
NEWSYM JoyAsmEnd

View File

@@ -23,7 +23,7 @@ EXTSYM GUIinit18_2hz,GUIinit36_4hz
EXTSYM GUIMenuItem
EXTSYM delay
NEWSYM DosModemRTNAsmStart
@@ -434,3 +434,4 @@ NEWSYM DeInitModemC
sti
ret
NEWSYM DosModemRTNAsmEnd

View File

@@ -19,7 +19,7 @@
EXTSYM SidewinderFix
NEWSYM SWAsmStart
@@ -223,3 +223,4 @@ ModeALoop:
dec ecx
jnz ModeALoop
ret
NEWSYM SWAsmEnd

View File

@@ -28,7 +28,7 @@ EXTSYM InitDrive,gotoroot,InitDir,fulladdtab
EXTSYM LFBpointer,noblocks,bytesperscanline,vesamode,VESAmodelist
NEWSYM Vesa12AsmStart
@@ -552,3 +552,5 @@ RMREGS
.sp dw 0
.ss dw 0
.spare times 20 dd 0
NEWSYM Vesa12AsmEnd

View File

@@ -27,7 +27,7 @@ EXTSYM UnusedBit,HalfTrans,UnusedBitXor,ngrposng,nggposng,ngbposng
; EXTSYM printhex
EXTSYM Init_2xSaIMMX,Init_2xSaI
NEWSYM Vesa2AsmStart
@@ -799,3 +799,4 @@ NEWSYM RMREGS
.ss dw 0
.spare times 20 dd 0
;----------------------------------------------------------------------
NEWSYM Vesa2AsmEnd

View File

@@ -17,7 +17,7 @@
%include "macros.mac"
NEWSYM EndMemAsmStart
@@ -247,3 +247,4 @@ NEWSYM bg4change, times 256 db 0
NEWSYM bgwinchange, times 256 db 0
NEWSYM PrevPicture, times 64*56*2 db 0
NEWSYM EndMemAsmEnd

View File

@@ -21,4 +21,3 @@ extern int FCosTab[2048];
#define FSINMAX 2047
#define FSin(x) FSinTab[(x)&FSINMAX]
#define FCos(x) FCosTab[(x)&FSINMAX]

View File

@@ -170,7 +170,7 @@ EXTSYM ipxgetchar,ipxsendchar,TCPIPStoreByte
EXTSYM TCPIPGetByte
EXTSYM ModemSendChar
NEWSYM GuiAsmStart
%include "gui/guitools.inc"
%include "gui/guimisc.inc"
@@ -184,6 +184,8 @@ EXTSYM ModemSendChar
; ProcessRemoteCommand
; NetLoadStuff ; Send 14 to initiate, Send 15 to cancel (either way)
; call PreparePacket
@@ -192,11 +194,8 @@ EXTSYM ModemSendChar
; call SendPacket
; NetAddChar
NEWSYM WaterOn, db 1
; Things to do :
;
; .checkmenuboxclick
@@ -885,9 +884,10 @@ NEWSYM GUIRestoreVars
.failb
ret
SECTION .data
NEWSYM ComboHeader, db 'Key Combination File',26,1,0
NEWSYM ComboBlHeader, times 23 db 0
SECTION .text
NEWSYM ExecGUISaveVars
cmp byte[ShowTimer],1
@@ -944,6 +944,7 @@ NEWSYM ExecGUISaveVars
call GUIDeInit
%endmacro
SECTION .data
NEWSYM GUIoldhand9o, dd 0
NEWSYM GUIoldhand9s, dw 0
NEWSYM GUIoldhand8o, dd 0
@@ -952,6 +953,7 @@ GUIt1cc dd 0
GUIt1ccSwap db 0
GUIskipnextkey42 db 0
SECTION .text
NEWSYM GUIinit18_2hz
mov al,00110110b
out 43H,al
@@ -1156,6 +1158,7 @@ LoadDetermine:
.noromloaded
ret
SECTION .data
SantaData:
db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
@@ -1171,6 +1174,7 @@ SantaNextT dd 36*15
NumSnow dd 0
NEWSYM SnowTimer, dd 36*30
MsgGiftLeft dd 0
SECTION .text
DrawSnow:
cmp byte[OkaySC],0
@@ -4890,6 +4894,4 @@ db 57,103,110,236,113,118,203,200,22,87,251,7,138,37,12,84,221,171,51,209
db 242,37,89,73,151,162,139,189,131,209,221,96,107,144,175,79,199,123,98,138
db 226,86,221,254,72,14,126,180,200,171,85,94,120,124,196,225,150,57,219,158
NEWSYM GuiAsmEnd

View File

@@ -4763,7 +4763,7 @@ GUIGUIAboutText3 db ' ZSKNIGHT',0
GUIGUIAboutText4 db ' _DEMO_',0
GUIGUIAboutText5 db 'ASSISTANT CODER : ',0
GUIGUIAboutText6 db ' PHAROS',0
GUIGUIAboutText7 db 'WIN PORT V0.86',0
GUIGUIAboutText7 db 'WIN PORT V0.85',0
GUIGUIAboutText8 db 'HOMEPAGE',0
DisplayGUIMovies:
@@ -5463,6 +5463,7 @@ DisplayGUICombo:
.noscrolldisplay
ret
GUIccombviewloc dd 0
GUIccombcursloc dd 0
GUIccomblcursloc dd 0
@@ -5619,3 +5620,4 @@ NEWSYM GUIMenuItem, db 'GAME ',0
db 'NETPLAY',0
db 'MISC ',0
db 25,0

View File

@@ -35,7 +35,7 @@ EXTSYM Voice0Disable,Voice1Disable,Voice2Disable,Voice3Disable
EXTSYM Voice4Disable,Voice5Disable,Voice6Disable,Voice7Disable
NEWSYM MenuAsmStart
@@ -1434,3 +1434,4 @@ restore16b:
mov byte[vesa2_gpos],6
.nored
ret
NEWSYM MenuAsmEnd

View File

@@ -83,9 +83,12 @@ EXTSYM pal16bxcl,ram7fa,regptra,regptwa,srama,vidmemch2,vidmemch4
EXTSYM vidmemch8,vcache2b,vcache4b,vcache8b,vram,wramdata
EXTSYM wramdataa
EXTSYM fname,fnames,GetCurDir
EXTSYM GUIcurrentdir,extractzip,PrintStr
;EXTSYM GUIcurrentdir,extractzip,PrintStr
;STUB DDOI
EXTSYM GUIcurrentdir, PrintStr
EXTSYM GUIsmcfind,GUIsfcfind,GUIswcfind,GUIfigfind,GUIfind058,GUIfind078,GUIfindBIN
EXTSYM GUIfindUSA,GUIfindJAP,GUIfindZIP,GUIfind1,DTALoc,GUIfindall,ZipError
;EXTSYM GUIfindUSA,GUIfindJAP,GUIfindZIP,GUIfind1,DTALoc,GUIfindall,ZipError
EXTSYM GUIfindUSA,GUIfindJAP,GUIfindZIP,GUIfind1,DTALoc,GUIfindall
EXTSYM spc7110romptr,allocspc7110
EXTSYM SRAMDir,SRAMDrive,cfgloadsdir,fnamest,statefileloc
EXTSYM ForcePal,InitDir,InitDrive,enterpress,frameskip
@@ -105,7 +108,7 @@ EXTSYM sramaccessbankr8s,sramaccessbankw16,sramaccessbankw16s
EXTSYM sramaccessbankw8,sramaccessbankw8s,GenerateBank0TableSA1
NEWSYM InitAsmStart
@@ -3545,6 +3548,11 @@ GUIfindBlank db '*.',0
InvalidZip db 'ZSNES Version A does not support .ZIP files.',13,10,'Please use Version C for this feature.',10,13,0
ZipError db 0
extractzip:
ret
UnZipFile:
cmp byte[OSPort],1
jne .noasm
@@ -5324,3 +5332,4 @@ NEWSYM outofmemoryerror, db 'OUT OF MEMORY.',0
NEWSYM outofmemoryerror2, db 'ROM IS TOO BIG.',0
SECTION .text
NEWSYM InitAsmEnd

View File

@@ -19,6 +19,27 @@
bits 32
section .text
; Zsnes required macros
%ifdef __LINUX__
%imacro newsym 1
GLOBAL %1
%1:
%endmacro
%imacro newsym 2+
GLOBAL %1
%1: %2
%endmacro
%define EXTSYM EXTERN
%macro ALIGN32 0
times ($$-$) & 1Fh nop ; Long word alignment
%endmacro
%macro ALIGN16 0
times ($$-$) & 1Fh nop ; Long word alignment
%endmacro
%else
%imacro newsym 1
GLOBAL _%1
_%1:
@@ -45,4 +66,5 @@ section .text
%define %1 _%1
%rotate 1
%endrep
%endmacro
%endmacro
%endif

View File

@@ -1,185 +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=${OBJDIR}/dosbuff.o ${OBJDIR}/ipx.o ${OBJDIR}/unzip.o\
${OBJDIR}/zipx.o ${OBJDIR}/zzip.o
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 coff
CC=gcc
PP=gpp
.SUFFIXES: .c .cpp .asm
%.o: %.c
${CC} ${CFLAGS} -o $@ -c $<
%.o: %.cpp
${PP} ${CFLAGS} -o $@ -c $<
%.o: %.asm
${ASM} ${ASMFLAGS} -o $@ $<
ALL: zsnes.exe
zsnes.exe: ${OBJS}
${CC} -Ws -s -o zsnes.exe ${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:
del *.o
del ${CHIPDIR}\*.o
del ${CPUDIR}\*.o
del ${VIDEODIR}\*.o
del ${GUIDIR}\*.o
del ${DOSDIR}\*.o
del zsnes.exe
#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=${OBJDIR}/dosbuff.o ${OBJDIR}/ipx.o ${OBJDIR}/unzip.o\
${OBJDIR}/zipx.o ${OBJDIR}/zzip.o
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 coff
CC=gcc
PP=gpp
.SUFFIXES: .c .cpp .asm
%.o: %.c
${CC} ${CFLAGS} -o $@ -c $<
%.o: %.cpp
${PP} ${CFLAGS} -o $@ -c $<
%.o: %.asm
${ASM} ${ASMFLAGS} -o $@ $<
ALL: zsnes.exe
zsnes.exe: ${OBJS}
${CC} -Ws -s -o zsnes.exe ${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:
del *.o
del ${CHIPDIR}\*.o
del ${CPUDIR}\*.o
del ${VIDEODIR}\*.o
del ${GUIDIR}\*.o
del ${DOSDIR}\*.o
del zsnes.exe

View File

@@ -20,15 +20,15 @@ CPUDIR=cpu
DOSDIR=dos
GUIDIR=gui
VIDEODIR=video
WINDIR=win
WINDIR=linux
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
CHIPSOBJ=${CHIPDIR}/sfxproc.o ${CHIPDIR}/fxemu2.o ${CHIPDIR}/dsp1proc.o\
${CHIPDIR}/fxemu2b.o ${CHIPDIR}/fxemu2c.o ${CHIPDIR}/fxtable.o\
${CHIPDIR}/sa1proc.o ${CHIPDIR}/sa1regs.o ${CHIPDIR}/dsp1emu.o
CPUOBJ=${CPUDIR}/addrni.o ${CPUDIR}/dma.o ${CPUDIR}/dsp.o ${CPUDIR}/dspproc.o\
${CPUDIR}/execute.o ${CPUDIR}/irq.o ${CPUDIR}/memory.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
@@ -39,32 +39,31 @@ VIDEOBJ=${VIDEODIR}/makev16b.o ${VIDEODIR}/makev16t.o ${VIDEODIR}/makevid.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
${VIDEODIR}/m716text.o ${VIDEODIR}/2xsaiw.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}/copyvwin.o ${WINDIR}/winintrf.o ${WINDIR}/sdllink.o\
${WINDIR}/zloaderw.o ${WINDIR}/ztcp.o ${WINDIR}/zipxw.o\
${WINDIR}/zfilew.o ${WINDIR}/protect.o
WINOBJ=${WINDIR}/copywin.o ${WINDIR}/winintrf.o ${WINDIR}/winlink.o\
${WINDIR}/zloaderw.o ${WINDIR}/ztcp.o ${WINDIR}/zipxw.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
PREOBJ=
#PREOBJ=${OBJDIR}/unzip.o ${OBJDIR}/zzip.o ${DOSDIR}/zsipx.o
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=
OBJS=${CHIPSOBJ} ${CPUOBJ} ${WINOBJ} ${WINDOSOBJ} ${GUIOBJ} ${VIDEOBJ} ${PREOBJ} ${MAINOBJ}
LIBS=`sdl-config --libs`
CFLAGS=-g -D__LINUX__ `sdl-config --cflags`
ASM=nasm
ASMFLAGS=-f elf
ASMFLAGS=-f elf -D__LINUX__ -g
CC=gcc
PP=g++
.SUFFIXES: .c .cpp .asm
%.o: %.c
${CC} ${CFLAGS} -o $@ -c $<
@@ -73,12 +72,12 @@ PP=g++
%.o: %.asm
${ASM} ${ASMFLAGS} -o $@ $<
ALL: zsnes
zsnes: ${OBJS}
${CC} -Ws -s -o zsnes ${OBJS} ${LIBS}
${CC} -o zsnes ${OBJS} ${LIBS}
${DOSDIR}/zloader.o: ${DOSDIR}/zloader.c
fixsin.o: fixsin.c
@@ -174,12 +173,11 @@ 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 ${WINDIR}/*.o
rm *.o
rm zsnes

View File

@@ -36,6 +36,7 @@ EXTSYM romloadskip
EXTSYM cfgloadgdir,cfgloadsdir
EXTSYM init18_2hz
NEWSYM UIAsmStart
%include "betauser.mac"
@@ -115,7 +116,7 @@ NEWSYM outofmemory
call PrintStr
jmp DosExit
;SECTION .data
SECTION .data
NEWSYM outofmem, db 'You don',39,'t have enough memory to run this program!',13,10,0
%define ZVERSION '18 '
;%define ZBETA 0
@@ -336,6 +337,39 @@ NEWSYM getcmdline
jmp .next2
.nomore
mov [FilenameStart],esi
%ifdef __LINUX__
mov byte[esi],'z'
mov byte[esi+1],'s'
mov byte[esi+2],'n'
mov byte[esi+3],'e'
mov byte[esi+4],'s'
mov byte[esi+5],'.'
mov byte[esi+6],'c'
mov byte[esi+7],'f'
mov byte[esi+8],'g'
mov byte[esi+9],0
mov byte[esi+256],'z'
mov byte[esi+1+256],'g'
mov byte[esi+2+256],'u'
mov byte[esi+3+256],'i'
mov byte[esi+4+256],'c'
mov byte[esi+5+256],'f'
mov byte[esi+6+256],'g'
mov byte[esi+7+256],'.'
mov byte[esi+8+256],'d'
mov byte[esi+9+256],'a'
mov byte[esi+10+256],'t'
mov byte[esi+11+256],0
mov byte[esi+512],'d'
mov byte[esi+1+512],'a'
mov byte[esi+2+512],'t'
mov byte[esi+3+512],'a'
mov byte[esi+4+512],'.'
mov byte[esi+5+512],'c'
mov byte[esi+6+512],'m'
mov byte[esi+7+512],'b'
mov byte[esI+8+512],0
%else
mov byte[esi],'Z'
mov byte[esi+1],'S'
mov byte[esi+2],'N'
@@ -367,12 +401,46 @@ NEWSYM getcmdline
mov byte[esi+6+512],'M'
mov byte[esi+7+512],'B'
mov byte[esI+8+512],0
%endif
ret
.nfound
mov edx,.stringnf
call PrintStr
mov esi,CMDLineStr
mov [FilenameStart],esi
%ifdef __LINUX__
mov byte[esi],'z'
mov byte[esi+1],'s'
mov byte[esi+2],'n'
mov byte[esi+3],'e'
mov byte[esi+4],'s'
mov byte[esi+5],'.'
mov byte[esi+6],'c'
mov byte[esi+7],'f'
mov byte[esi+8],'g'
mov byte[esi+9],0
mov byte[esi+256],'z'
mov byte[esi+1+256],'g'
mov byte[esi+2+256],'u'
mov byte[esi+3+256],'i'
mov byte[esi+4+256],'c'
mov byte[esi+5+256],'f'
mov byte[esi+6+256],'g'
mov byte[esi+7+256],'.'
mov byte[esi+8+256],'d'
mov byte[esi+9+256],'a'
mov byte[esi+10+256],'t'
mov byte[esi+11+256],0
mov byte[esi+512],'d'
mov byte[esi+1+512],'a'
mov byte[esi+2+512],'t'
mov byte[esi+3+512],'a'
mov byte[esi+4+512],'.'
mov byte[esi+5+512],'c'
mov byte[esi+6+512],'m'
mov byte[esi+7+512],'b'
mov byte[esI+8+512],0
%else
mov byte[esi],'Z'
mov byte[esi+1],'S'
mov byte[esi+2],'N'
@@ -404,6 +472,7 @@ NEWSYM getcmdline
mov byte[esi+6+512],'M'
mov byte[esi+7+512],'B'
mov byte[esI+8+512],0
%endif
ret
SECTION .data
@@ -1020,7 +1089,11 @@ NEWSYM makeextension
.loopz
dec edx
mov al,[fnames+edx]
%ifdef __LINUX__
cmp al, '/'
%else
cmp al,'\'
%endif
je .addext
cmp al,'.'
je .addb
@@ -1033,6 +1106,17 @@ NEWSYM makeextension
mov byte[fnames+ebx],'.'
mov byte[fnamest+ebx],'.'
inc ebx
%ifdef __LINUX__
mov byte[fnames+ebx],'s'
mov byte[fnamest+ebx],'z'
inc ebx
mov byte[fnames+ebx],'r'
mov byte[fnamest+ebx],'s'
inc ebx
mov byte[fnames+ebx],'m'
mov byte[fnamest+ebx],'t'
mov dword[statefileloc],ebx
%else
mov byte[fnames+ebx],'S'
mov byte[fnamest+ebx],'Z'
inc ebx
@@ -1042,6 +1126,7 @@ NEWSYM makeextension
mov byte[fnames+ebx],'M'
mov byte[fnamest+ebx],'T'
mov dword[statefileloc],ebx
%endif
inc ebx
mov byte[fnames+ebx],0
mov byte[fnamest+ebx],0
@@ -1327,3 +1412,4 @@ NEWSYM DosExit ; Terminate Program
mov ax,4c00h ;terminate
int 21h
NEWSYM UIAsmEnd

View File

@@ -56,7 +56,7 @@ EXTSYM tltype2b
EXTSYM tltype8b
NEWSYM VCacheAsmStart
@@ -3762,3 +3762,4 @@ NEWSYM cachesingle8bng
pop edi
pop esi
ret
NEWSYM VCacheAsmEnd

View File

@@ -17,7 +17,7 @@
%include "macros.mac"
NEWSYM TwoxSaiWAsmStart
;/*---------------------------------------------------------------------*
; * The following (piece of) code, (part of) the 2xSaI engine, *
; * copyright (c) 1999 by Derek Liauw Kie Fa. *
@@ -1342,3 +1342,6 @@ final1a times 8 db 0
final1b times 8 db 0
final2a times 8 db 0
final2b times 8 db 0
SECTION .text
NEWSYM TwoxSaiWAsmEnd

View File

@@ -831,6 +831,7 @@ copyvesa2320x480x8ng:
;*******************************************************
ALIGN32
SECTION .data
NEWSYM EagleHold, dd 0
NEWSYM smallscreenon, dd 0
NEWSYM smallscreence, dd 0
@@ -838,7 +839,7 @@ NEWSYM CurrentGUIOn, dd 0
vesavaland dd 0,0
mmxvalanda dd 11111111110000001111111111000000b,11111111110000001111111111000000b
mmxvalandb dd 00000000000111110000000000011111b,00000000000111110000000000011111b
SECTION .text
NEWSYM copyvesa2640x480x8bgui
mov byte[CurrentGUIOn],1
cmp byte[smallscreenon],1
@@ -5695,3 +5696,4 @@ NEWSYM Clear2xSaIBuffer
add ebx,4
loop .nextb
ret

View File

@@ -24,7 +24,7 @@ EXTSYM vesa2_clbit,vram,vrama,winon,xtravbuf,winptrref,scaddset
EXTSYM fulladdtab
EXTSYM cwinptr
NEWSYM M716TExtAsmStart
@@ -991,3 +991,4 @@ extbg2sub:
cmp dh,1
jne near domosaic16b
ret
NEWSYM M716TExtAsmEnd

View File

@@ -51,6 +51,7 @@ EXTSYM ofsmcptr,ofsmady,ofsmadx,yposng,yposngom,flipyposng,flipyposngom
EXTSYM ofsmtptr,ofsmmptr,ofsmcyps,bgtxadd,bg1ptrx,bg1ptry
EXTSYM a16x16xinc,a16x16yinc
NEWSYM MakeV16BAsmStart
%include "video/vidmacro.mac"
@@ -3082,3 +3083,4 @@ draw16x1616bwinon:
jne near domosaic16b
ret
NEWSYM MakeV16BAsmEnd

View File

@@ -60,6 +60,7 @@ EXTSYM ofsmcptr,ofsmady,ofsmadx,yposng,yposngom,flipyposng,flipyposngom
EXTSYM ofsmtptr,ofsmmptr,ofsmcyps,bgtxadd,bg1ptrx,bg1ptry
EXTSYM a16x16xinc,a16x16yinc
NEWSYM MakeV16TAsmStart
%include "video/vidmacro.mac"
@@ -5310,3 +5311,4 @@ NEWSYM draw16x1616tswinon
dec byte[tileleft16b]
jnz near .loopa
ret
NEWSYM MakeV16TAsmEnd

View File

@@ -41,6 +41,8 @@ EXTSYM tempoffset,vidmemch2,vidmemch4,vidmemch8
EXTSYM ofsmcptr,ofsmady,ofsmadx,yposng,yposngom,flipyposng,flipyposngom
EXTSYM ofsmtptr,ofsmmptr,ofsmcyps,bgtxadd,bg1ptrx,bg1ptry
NEWSYM MakeVidAsmStart
%include "video/vidmacro.mac"
@@ -4383,3 +4385,4 @@ NEWSYM a16x16xinc, db 0
NEWSYM a16x16yinc, db 0
NEWSYM MakeVidAsmEnd

View File

@@ -25,6 +25,8 @@ EXTSYM pesimpng
EXTSYM mode7hr
EXTSYM BGMA, mode7ab, mode7cd, BG1SYl, BG1SXl, mosenng, mosszng
NEWSYM Mode7AsmStart
%include "video/mode7.mac"
@@ -815,3 +817,4 @@ NEWSYM processmode7hires
pop esi
.nogo
ret
NEWSYM Mode7AsmEnd

View File

@@ -29,6 +29,7 @@ EXTSYM mode7ab,mode7cd,BGMA
EXTSYM BG1SXl,BG1SYl
EXTSYM processmode7hires
NEWSYM Mode716AsmStart
%include "video/mode716.mac"
@@ -684,3 +685,4 @@ NEWSYM processmode7hires16bd
.nogo
ret
NEWSYM Mode716AsmEnd

View File

@@ -22,6 +22,7 @@ EXTSYM mode7A,mode7B,mode7C,mode7D,mode7X0,mode7Y0,mode7set
EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,drawmode7dcolor
EXTSYM cwinptr
NEWSYM Mode716BAsmStart
%include "video/mode7.mac"
@@ -186,3 +187,4 @@ ALIGN32
Mode7Process Mode7Window, domosaic16b, 2
.nextval3w
Mode7ProcessB Mode7Window, domosaic16b, 2
NEWSYM Mode716BAsmEnd

View File

@@ -21,6 +21,7 @@ EXTSYM curmosaicsz,curvidoffset,domosaic16b,winptrref,scaddset
EXTSYM mode7A,mode7B,mode7C,mode7D,mode7X0,mode7Y0,mode7set,cwinptr
EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,dcolortab,vidbright
NEWSYM Mode716DAsmStart
%include "video/mode7.mac"
@@ -230,3 +231,4 @@ ALIGN32
Mode7Process Mode7Window, domosaic16b, 2
.nextval3w
Mode7ProcessB Mode7Window, domosaic16b, 2
NEWSYM Mode716DAsmEnd

View File

@@ -23,7 +23,7 @@ EXTSYM pal16b,vram,vrama,winon,mode7tab,xtravbuf,drawmode7dcolor
EXTSYM cwinptr
NEWSYM Mode716EAsmStart
@@ -1258,3 +1258,4 @@ NEWSYM drawmode716extbg2
cmp dh,1
jne near domosaic16b
ret
NEWSYM Mode716EAsmEnd

View File

@@ -24,6 +24,8 @@ EXTSYM pal16b,pal16bcl,pal16bxcl,scaddtype,scrnon,transpbuf,drawmode716b
EXTSYM vesa2_clbit,vram,vrama,winon,xtravbuf,winptrref,scaddset
EXTSYM fulladdtab
NEWSYM Mode716TAsmStart
%include "video/mode7.mac"
@@ -361,3 +363,4 @@ NEWSYM drawmode716tb
cwinptr2 dd 0
NEWSYM Mode716TAsmEnd

View File

@@ -26,6 +26,7 @@ EXTSYM nglogicval,winlogicaval,ProcessMode7ngwinD,ProcessMode7ngwinC
EXTSYM ngwinen, winbg1enval, BuildWindow, ngwintable, ngcwinptr
EXTSYM ProcessMode7ngwin,ProcessMode7ngwinB
NEWSYM Mode7ExtAsmStart
%include "video/mode7.mac"
@@ -1315,3 +1316,4 @@ NEWSYM drawmode7ngextbg2
jne near domosaic
ret
NEWSYM Mode7ExtAsmEnd

View File

@@ -28,6 +28,8 @@ EXTSYM pal16bxcl
EXTSYM coadder16
EXTSYM a16x16xinc,a16x16yinc,curypos,yflipadd
NEWSYM MV16TMSAsmStart
%include "video/vidmacro.mac"
@@ -1499,3 +1501,4 @@ NEWSYM draw16x1616tswinonms
dec byte[tileleft16b]
jnz near .loopa
ret
NEWSYM MV16TMSAsmEnd

View File

@@ -31,6 +31,8 @@ EXTSYM vidmemch2s,vidmemch4s,vidmemch8s
EXTSYM cpalval
EXTSYM SpecialLine
NEWSYM NewG162AsmStart
%include "video/vidmacro.mac"
%include "video/newg162.mac"
%include "video/newgfx16.mac"
@@ -1399,3 +1401,4 @@ drawlineng4b16bmsom16x16:
drawlineng4b16bmsntom16x16
drawline16bmacroom16x16 tltype4b,preparet4ba,cachesingle4bng,ngpalcon4b,test4ba,0Fh,procpixelsmsnt,procpixelstmsnt
NEWSYM NewG162AsmEnd

View File

@@ -47,6 +47,8 @@ EXTSYM winlogicb
EXTSYM ngwinptr,objwlrpos,objwen,objclineptr,CSprWinPtr
EXTSYM WindowRedraw
NEWSYM NewGfxAsmStart
%include "video/vidmacro.mac"
%include "video/newgfx2.mac"
%include "video/newgfx.mac"
@@ -2336,3 +2338,5 @@ NEWSYM preparesprpr
ALIGN32
NEWSYM sprclprio, dd 0
NEWSYM sprsingle, dd 0
NEWSYM NewGfxAsmEnd

View File

@@ -65,6 +65,8 @@ EXTSYM NGNumSpr
EXTSYM fulladdtab
EXTSYM FPUCopy
NEWSYM NewGfx16AsmStart
%include "video/vidmacro.mac"
%include "video/newgfx16.mac"
%include "video/newg162.mac"
@@ -3409,3 +3411,4 @@ NEWSYM FullBitAnd, dd 0F800F800h,0F800F800h
NEWSYM HalfTransB, dd 00001000010000010000100001000001b,00001000010000010000100001000001b
NEWSYM HalfTransC, dd 11110111100111101111011110011110b,11110111100111101111011110011110b
NEWSYM NGNoTransp, dd 0
NEWSYM NewGfx16AsmEnd

View File

@@ -26,6 +26,8 @@ EXTSYM ngpalcon2b,tleftnb,tltype2b,tltype4b,tltype8b,yposng,flipyposng
EXTSYM ofsmcptr,ofsmtptr,ofsmmptr,ofsmcyps,ofsmady,ofsmadx
EXTSYM yposngom,flipyposngom,cbgval,ofsmval,ofsmvalh,vram
NEWSYM NewGfx2AsmStart
%include "video/vidmacro.mac"
%include "video/newgfx2.mac"
%include "video/newgfx.mac"
@@ -671,3 +673,4 @@ Processwinclipom4b:
cmp dword[ngcwinmode],1
je near drawlinengom4bwin.winclipped
jmp drawlinengom4bwin.loop
NEWSYM NewGfx2AsmEnd

View File

@@ -54,10 +54,12 @@ EXTSYM ChatNick
EXTSYM StringLength
EXTSYM chatstrLt
NEWSYM ProcVidAsmStart
NEWSYM ScreenScale, db 0 ; If horizontal is scaled or not
NEWSYM TempDebugV, dw 0 ; Temporary Debugging variable
%macro MMXStuff 0
%%1
movq mm0,[esi]
@@ -3571,6 +3573,7 @@ NEWSYM vidpaste
.SSRedCo dw 0
NEWSYM lastfps, db 0 ; stores the last fps encountered
NEWSYM lastfps2, db 0 ; stores the last fps encountered
NEWSYM curfps2, db 0 ; current video refresh fps
@@ -3602,3 +3605,4 @@ db 0,0,0,0,0,0,0,1,1,1,1,1,0,0,0,0,0,0,0,0
db 0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,0,0
db 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
NEWSYM ProcVidAsmEnd