From 9a9ab4fb33dfb3fddb7fd800ce082bd9b9c4e995 Mon Sep 17 00:00:00 2001 From: grinvader <> Date: Sun, 26 Feb 2006 04:56:59 +0000 Subject: [PATCH] Ok, rm -fr isn't what I wanted. Fixed. Also some cleanup. --- zsnes/src/Makefile.in | 4 ++-- zsnes/src/chips/fxemu2c.asm | 7 ++----- zsnes/src/chips/fxemu2c.mac | 8 -------- zsnes/src/linux/sdlintrf.asm | 11 +++++------ zsnes/src/win/winintrf.asm | 5 ++--- 5 files changed, 11 insertions(+), 24 deletions(-) diff --git a/zsnes/src/Makefile.in b/zsnes/src/Makefile.in index 53e4982b..53a385f9 100644 --- a/zsnes/src/Makefile.in +++ b/zsnes/src/Makefile.in @@ -288,7 +288,7 @@ uninstall: rm -f @prefix@/bin/$(notdir @ZSNESEXE@) @prefix@/man/man5/zsnes.5 clean: - rm -fr *.o ${PSR} psrhead/*.h temppsr.c @ZSNESEXE@ + rm -f ${ZOBJS} ${PSR} psrhead/*.h temppsr.c @ZSNESEXE@ distclean: - rm -fr *.o ${PSR} psrhead/*.h temppsr.c @ZSNESEXE@ Makefile aclocal.m4 configure config.cache config.log config.status config.h + rm -f ${ZOBJS} ${PSR} psrhead/*.h temppsr.c @ZSNESEXE@ Makefile aclocal.m4 configure config.cache config.log config.status config.h diff --git a/zsnes/src/chips/fxemu2c.asm b/zsnes/src/chips/fxemu2c.asm index 30a284b4..94920d28 100644 --- a/zsnes/src/chips/fxemu2c.asm +++ b/zsnes/src/chips/fxemu2c.asm @@ -29,17 +29,14 @@ EXTSYM SfxRomBuffer,SfxSCBR,SfxSCMR,SfxSFR,SfxSignZero,SfxnRamBanks,flagnz EXTSYM sfx128lineloc,sfx160lineloc,sfx192lineloc,sfxobjlineloc,sfxramdata EXTSYM withr15sk,sfxclineloc,SCBRrel,ChangeOps EXTSYM fxbit01pcal,fxbit23pcal,fxbit45pcal,fxbit67pcal -EXTSYM fxbit01,fxbit23,fxbit45,fxbit67 -EXTSYM fxxand -EXTSYM PLOTJmpa,PLOTJmpb +EXTSYM fxbit01,fxbit23,fxbit45,fxbit67,fxxand,PLOTJmpa,PLOTJmpb %include "chips/fxemu2.mac" %include "chips/fxemu2c.mac" - -SECTION .text ;ALIGN=32 +SECTION .text ALIGN32 NEWSYM FxOpd00 ; STOP stop GSU execution (and maybe generate an IRQ) ; Verified. diff --git a/zsnes/src/chips/fxemu2c.mac b/zsnes/src/chips/fxemu2c.mac index eb024f57..2fc4f45a 100644 --- a/zsnes/src/chips/fxemu2c.mac +++ b/zsnes/src/chips/fxemu2c.mac @@ -20,14 +20,6 @@ - - - - - - -EXTSYM WriteLine - %macro FXReturn 0 dec dword[NumberOfOpcodes] ;pushad diff --git a/zsnes/src/linux/sdlintrf.asm b/zsnes/src/linux/sdlintrf.asm index 531f7edd..e8db4b07 100644 --- a/zsnes/src/linux/sdlintrf.asm +++ b/zsnes/src/linux/sdlintrf.asm @@ -32,7 +32,7 @@ EXTSYM ZFileRead,ZFileDelFName,ZFileDelete,ZCloseFileHandle,ZCloseFile EXTSYM ZFileTellHandle,ZFileTell,ZFFTimeFName,ZFTime,ZFDate,ZFileGetFTime EXTSYM GetTime,GetDate,GUIkeydelay2,ZFileCHDir,CHPath EXTSYM ZFileGetDir,DirName,DTALoc,DTALocPos,ZFileFindATTRIB -EXTSYM ZFileFindFirst,ZFileFindNext,ZFileFindPATH,soundon,DSPDisable,Start60HZ +EXTSYM ZFileFindFirst,ZFileFindNext,ZFileFindPATH,soundon,Start60HZ EXTSYM pressed,RaisePitch,AdjustFrequency,vidbufferofsb,vidbuffer,clearwin EXTSYM Stop60HZ,initwinvideo,vesa2_rpos,vesa2_gpos,vesa2_bpos,vesa2_rposng EXTSYM vesa2_gposng,vesa2_bposng,vesa2_usbit,vesa2_clbit,vesa2_clbitng @@ -41,11 +41,10 @@ EXTSYM vesa2_bits,vesa2_x,vesa2_y,genfulladdtab,GUICPC,drawscreenwin EXTSYM ConvertToAFormat,HalfTrans,UnusedBit,UnusedBitXor EXTSYM ngrposng,nggposng,ngbposng,HalfTransB,HalfTransC,UpdateVFrame,GetMouseX EXTSYM GetMouseY,GetMouseMoveX,GetMouseMoveY,GetMouseButton,T36HZEnabled -EXTSYM MouseButton,Start36HZ,Stop36HZ,BufferSizeW,BufferSizeB,ProcessSoundBuffer -EXTSYM CheckTimers,vesa2_rfull,vesa2_rtrcl,vesa2_rtrcla,vesa2_gfull,vesa2_gtrcl -EXTSYM vesa2_gtrcla,vesa2_bfull,vesa2_btrcl,vesa2_btrcla,Init_2xSaIMMXW -EXTSYM GetLocalTime,V8Mode,GrayscaleMode -EXTSYM PrevWinMode,PrevFSMode,sem_sleep,ZsnesPage +EXTSYM MouseButton,Start36HZ,Stop36HZ,CheckTimers,vesa2_rfull,vesa2_rtrcl +EXTSYM vesa2_rtrcla,vesa2_gfull,vesa2_gtrcl,vesa2_gtrcla,vesa2_bfull,vesa2_btrcl +EXTSYM vesa2_btrcla,Init_2xSaIMMXW,GetLocalTime,V8Mode,GrayscaleMode,PrevWinMode +EXTSYM PrevFSMode,sem_sleep ; NOTE: For timing, Game60hzcall should be called at 50hz or 60hz (depending ; on romispal) after a call to InitPreGame and before DeInitPostGame are diff --git a/zsnes/src/win/winintrf.asm b/zsnes/src/win/winintrf.asm index 1ae7f56f..b9ccc4a6 100644 --- a/zsnes/src/win/winintrf.asm +++ b/zsnes/src/win/winintrf.asm @@ -46,9 +46,8 @@ EXTSYM SetMouseMaxY,SetMouseX,SetMouseY,T36HZEnabled,MouseButton,Start36HZ EXTSYM Stop36HZ,BufferSizeW,BufferSizeB,ProcessSoundBuffer,CheckTimers EXTSYM vesa2_rfull,vesa2_rtrcl,vesa2_rtrcla,vesa2_gfull,vesa2_gtrcl,vesa2_gtrcla EXTSYM vesa2_bfull,vesa2_btrcl,vesa2_btrcla,Init_2xSaIMMXW,DoSleep -EXTSYM ZsnesPage,V8Mode,GrayscaleMode,PrevWinMode,PrevFSMode,FrameSemaphore -EXTSYM _imp__GetLocalTime@4 -EXTSYM DisplayWIPDisclaimer +EXTSYM V8Mode,GrayscaleMode,PrevWinMode,PrevFSMode,FrameSemaphore +EXTSYM _imp__GetLocalTime@4,DisplayWIPDisclaimer ; NOTE: For timing, Game60hzcall should be called at 50hz or 60hz (depending ; on romispal) after a call to InitPreGame and before DeInitPostGame are