a_dinosaur/ZSNES
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed __LINUX__ to __UNIXSDL__.

Browse Source
This commit is contained in:
n-a-c-h
2005-07-10 02:05:12 +00:00
parent 251758fbc3
commit ea1e34a964
37 changed files with 183 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
zsnes/src/gui/gui.asm
View File

@@ -142,7 +142,7 @@ EXTSYM GUIwinposy2,GUIwinposx2,AllowMultipleInst,Surround,SoundBufEn,SPCDisable
EXTSYM GUIEnableTransp,FilteredGUI,MouseWheel,TrapMouseCursor,AlwaysOnTop
EXTSYM pl1p209,pl1p209b,SaveMainWindowPos,FastFwdToggle,SidewinderFix,RaisePitch
%ifdef __LINUX__
%ifdef __UNIXSDL__
EXTSYM numlockptr
%endif
%ifdef __WIN32__
@@ -1843,7 +1843,7 @@ guipostvideofail:
call GUIUnBuffer
call DisplayBoxes
call DisplayMenu
%ifndef __LINUX__
%ifndef __UNIXSDL__
mov dword[GUIkeydelay],0FFFFFFFFh
%else
mov dword[GUIkeydelay],0x0
@@ -2626,7 +2626,7 @@ DisplayMenu:
GUIBox 0,14,229,14,70
GUIBox 0,15,229,15,71
%ifdef __LINUX__
%ifdef __UNIXSDL__
GUIShadow 238,9,247,20
GUIShadow 249,9,257,20
%endif
@@ -2637,7 +2637,7 @@ DisplayMenu:
%endif
.notwinpressa
%ifdef __LINUX__
%ifdef __UNIXSDL__
mov byte[GUIMenuItem+36],247
GUIDMHelpB 233,242,GUIMenuItem+36,1
mov byte[GUIMenuItem+36],'x'

2
zsnes/src/gui/guifuncs.c
View File

@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#ifdef __LINUX__
#ifdef __UNIXSDL__
#include "gblhdr.h"
#define DIR_SLASH "/"
#else

102
zsnes/src/gui/guikeys.inc
View File

@@ -179,7 +179,7 @@ GUIgetcurrentinput:
mov byte[GUIDelayB],0
; Convert pressed to keys
mov dword[GUIfirstkey],0
%ifdef __LINUX___
%ifdef __UNIXSDL___
GUIqcheckkeys 90 ; UP
GUIqcheckkeys 96 ; DOWN
GUIqcheckkeys 92 ; LEFT
@@ -228,7 +228,7 @@ GUIgetcurrentinput:
GUIqcheckkeys2 [pl1Ak],7
.nopad1
xor al,al
%ifdef __LINUX__
%ifdef __UNIXSDL__
GUIgetprkeys 90,90 ; UP
GUIgetprkeys 96,96 ; DOWN
GUIgetprkeys 92,92 ; LEFT
@@ -268,7 +268,7 @@ GUIgetcurrentinput:
mov al,cl
.notextkb
%ifdef __LINUX__
%ifdef __UNIXSDL__
GUIgetprkeys 90,90 ; UP
GUIgetprkeys 96,96 ; DOWN
GUIgetprkeys 92,92 ; LEFT
@@ -625,7 +625,7 @@ GUIgetcurrentinput:
jne .noenter
call GUITryMenuItem
.noenter
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,92
je .leftpressed
cmp dword[numlockptr],1
@@ -645,7 +645,7 @@ GUIgetcurrentinput:
.left
mov byte[GUIcmenupos],6
.noleft
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,94
je .rightpressed
cmp dword[numlockptr],1
@@ -665,7 +665,7 @@ GUIgetcurrentinput:
.noright
cmp byte[GUIcmenupos],0
je near .noupdown
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,96
je .downpressed
cmp dword[numlockptr],1
@@ -691,7 +691,7 @@ GUIgetcurrentinput:
mov [GUIcrowpos],al
jmp .nokey
.nodown
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al, 90
je .uppressed
cmp dword[numlockptr],1
@@ -1163,7 +1163,7 @@ GUIVideoKeys:
jne .nograyscale
xor byte[GrayscaleMode],1
.nograyscale
%ifndef __LINUX__
%ifndef __UNIXSDL__
cmp dh,'V'
jne .novsync
xor byte[vsyncon],1
@@ -1178,7 +1178,7 @@ GUIVideoKeys:
.novsync
%endif
; "Home"
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp dl,89
je .yeshome
cmp dword[numlockptr],1
@@ -1194,7 +1194,7 @@ GUIVideoKeys:
mov dword[GUIcurrentvideoviewloc],0
.nohome
; "End"
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp dl,95
je .yesendp
cmp dword[numlockptr],1
@@ -1216,7 +1216,7 @@ GUIVideoKeys:
mov dword[GUIcurrentvideoviewloc],0
.noendp
; "Up"
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp dl,90
je .up
cmp dword[numlockptr],1
@@ -1238,7 +1238,7 @@ GUIVideoKeys:
dec dword[GUIcurrentvideocursloc]
.noup
; "Down"
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp dl,96
je .yesdown
cmp dword[numlockptr],1
@@ -1261,7 +1261,7 @@ GUIVideoKeys:
inc dword[GUIcurrentvideoviewloc]
.nodown
; "PageUp"
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp dl,91
je .yespageup
cmp dword[numlockptr],1
@@ -1285,7 +1285,7 @@ GUIVideoKeys:
.posc
.nopageup
; "PageDown"
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp dl,97
je .yespagedn
cmp dword[numlockptr],1
@@ -1623,7 +1623,7 @@ GUICheatKeys:
jne .nozero
ret
.nozero
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,89
je .homepressed
cmp dword[numlockptr],1
@@ -1639,7 +1639,7 @@ GUICheatKeys:
mov dword[GUIcurrentcheatviewloc],0
ret
.nohome
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,89
je .endppressed
cmp dword[numlockptr],1
@@ -1662,7 +1662,7 @@ GUICheatKeys:
.posve
ret
.noendp
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,90
je .up
cmp dword[numlockptr],1
@@ -1683,7 +1683,7 @@ GUICheatKeys:
.noviewdec
dec dword[GUIcurrentcheatcursloc]
.noup
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al, 96
je .downpressed
cmp dword[numlockptr],1
@@ -1706,7 +1706,7 @@ GUICheatKeys:
inc dword[GUIcurrentcheatviewloc]
.noviewinc
.nodown
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,91
je .pageuppressed
cmp dword[numlockptr],1
@@ -1729,7 +1729,7 @@ GUICheatKeys:
mov dword[GUIcurrentcheatcursloc],0
.posc
.nopageup
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al, 97
je .pagednpressed
cmp dword[numlockptr],1
@@ -2082,7 +2082,7 @@ GUICheatSearchKeys:
mov byte[CheatCompareValue],3
.notnotequalthan
%ifdef __LINUX__ ; Select with Arrow Keys
%ifdef __UNIXSDL__ ; Select with Arrow Keys
cmp al,90
je .yesmoveup
cmp dword[numlockptr],1
@@ -2098,7 +2098,7 @@ GUICheatSearchKeys:
je .nomoveup
dec byte[CheatCompareValue]
.nomoveup
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,96
je .yesmovedown
cmp dword[numlockptr],1
@@ -2149,7 +2149,7 @@ GUICheatSearchKeys:
ret
.nozero ; Select Codes with arrow keys
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,89
je .yeshome
cmp dword[numlockptr],1
@@ -2165,7 +2165,7 @@ GUICheatSearchKeys:
mov dword[GUIcurrentchtsrcviewloc],0
ret
.nohome
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,95
je .yesendp
cmp dword[numlockptr],1
@@ -2188,7 +2188,7 @@ GUICheatSearchKeys:
.posve
ret
.noendp
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,90
je .up
cmp dword[numlockptr],1
@@ -2209,7 +2209,7 @@ GUICheatSearchKeys:
.noviewdec
dec dword[GUIcurrentchtsrccursloc]
.noup
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,96
je .yesdown
cmp dword[numlockptr],1
@@ -2233,7 +2233,7 @@ GUICheatSearchKeys:
.noviewinc
.nodown
%ifdef __LINUX__ ; Pageup/Down to select Cheats
%ifdef __UNIXSDL__ ; Pageup/Down to select Cheats
cmp al,91
je .yespgup
cmp dword[numlockptr],1
@@ -2256,7 +2256,7 @@ GUICheatSearchKeys:
mov dword[GUIcurrentchtsrccursloc],0
.posc
.nopageup
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,97
je .yespgdn
cmp dword[numlockptr],1
@@ -2361,7 +2361,7 @@ GUIStateSelKeys:
mov [GUIcmenupos],al
ret
.noenter
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,92 ; linux keypad left
je .yesleft
cmp dword[numlockptr],1 ; if numlock on, disregard numpad
@@ -2390,7 +2390,7 @@ GUIStateSelKeys:
dec cl
jmp .done
.noleft
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,94 ; linux keypad right
je .yesright
cmp dword[numlockptr],1 ; if numlock on, disregard numpad
@@ -2419,7 +2419,7 @@ GUIStateSelKeys:
inc cl
jmp .done
.noright
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,90 ; linux keypad up
je .yesvert
cmp dword[numlockptr],1 ; if numlock on, disregard numpad
@@ -2428,7 +2428,7 @@ GUIStateSelKeys:
cmp al,72 ; linux numpad up, non-linux num/keypad up
je .yesvert
.noup
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,96 ; linux keypad down
je .yesvert
cmp dword[numlockptr],1 ; if numlock on, disregard numpad
@@ -2462,7 +2462,7 @@ GUIStateSelKeys:
; Allows you to select boxes with the arrow keys, Enter to choose
GUIResetKeys:
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,92
je .yesleft
cmp dword[numlockptr],1
@@ -2476,7 +2476,7 @@ GUIResetKeys:
%endif
mov byte[GUICResetPos],0
.noleft
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,94
je .yesright
cmp dword[numlockptr],1
@@ -2522,7 +2522,7 @@ GUIResetKeys:
; Allows you to select boxes with the arrow keys, Enter to choose
GUIStateKeys:
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,92
je .yesleft
cmp dword[numlockptr],1
@@ -2536,7 +2536,7 @@ GUIStateKeys:
%endif
mov byte[GUICStatePos],0
.noleft
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,94
je .yesright
cmp dword[numlockptr],1
@@ -2587,7 +2587,7 @@ GUILoadKeys:
je .noright
cmp dword[GUIdirentries],0
je .noright
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,92
je .yesleft
cmp dword[numlockptr],1
@@ -2602,7 +2602,7 @@ GUILoadKeys:
mov byte[GUILoadPos],0
xor dword[GUIcurrentfilewin],1
.noleft
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,94
je .yesright
cmp dword[numlockptr],1
@@ -2625,7 +2625,7 @@ GUILoadKeys:
.nextl
cmp byte[ebx],':'
je .donel
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp byte[ebx],'/'
%else
cmp byte[ebx],'\'
@@ -2655,7 +2655,7 @@ GUILoadKeys:
.noenter
cmp dword[GUIcurrentfilewin],1
je near .dirwin
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,89
je .yeshome
cmp dword[numlockptr],1
@@ -2672,7 +2672,7 @@ GUILoadKeys:
mov dword[GUIcurrentviewloc],0
ret
.nohome
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,95
je .yesendp
cmp dword[numlockptr],1
@@ -2696,7 +2696,7 @@ GUILoadKeys:
.posve
ret
.noendp
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,90
je .up
cmp dword[numlockptr],1
@@ -2718,7 +2718,7 @@ GUILoadKeys:
.noviewdec
dec dword[GUIcurrentcursloc]
.noup
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,96
je .yesdown
cmp dword[numlockptr],1
@@ -2742,7 +2742,7 @@ GUILoadKeys:
inc dword[GUIcurrentviewloc]
.noviewinc
.nodown
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,91
je .yespageup
cmp dword[numlockptr],1
@@ -2766,7 +2766,7 @@ GUILoadKeys:
mov dword[GUIcurrentcursloc],0
.posc
.nopageup
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,97
je .yespagedn
cmp dword[numlockptr],1
@@ -2953,7 +2953,7 @@ SECTION .bss
SECTION .text
.dirwin
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,89
je .yeshome2
cmp dword[numlockptr],1
@@ -2970,7 +2970,7 @@ SECTION .text
mov dword[GUIcurrentdirviewloc],0
ret
.nohome2
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,95
je .yesendp2
cmp dword[numlockptr],1
@@ -2994,7 +2994,7 @@ SECTION .text
.posve2
ret
.noendp2
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,90
je .yesup2
cmp dword[numlockptr],1
@@ -3016,7 +3016,7 @@ SECTION .text
.noviewdec2
dec dword[GUIcurrentdircursloc]
.noup2
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,96
je .yesdown2
cmp dword[numlockptr],1
@@ -3040,7 +3040,7 @@ SECTION .text
inc dword[GUIcurrentdirviewloc]
.noviewinc2
.nodown2
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,91
je .yespgup2
cmp dword[numlockptr],1
@@ -3064,7 +3064,7 @@ SECTION .text
mov dword[GUIcurrentdircursloc],0
.posc2
.nopageup2
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp al,97
je .yespgdn2
cmp dword[numlockptr],1

14
zsnes/src/gui/guiload.inc
View File

@@ -203,7 +203,7 @@ GUIloadfilename:
mov ebx,LoadDir
mov edx,LoadDrive
call Get_Dir
%ifndef __LINUX__
%ifndef __UNIXSDL__
cmp byte[cfgloadsdir],0
jne .nosdrive
pushad
@@ -1013,7 +1013,7 @@ SECTION .text
NEWSYM GetCurDir
; get Drive/Dir
%ifndef __LINUX__
%ifndef __UNIXSDL__
mov ebx,GUIcurrentdir+3
%else
mov ebx,GUIcurrentdir
@@ -1021,7 +1021,7 @@ NEWSYM GetCurDir
mov edx,GUIcurrentdir
call Get_Dir
%ifndef __LINUX__
%ifndef __UNIXSDL__
add byte[GUIcurrentdir],65
mov byte[GUIcurrentdir+1],':'
@@ -1285,7 +1285,7 @@ GUIGetDirs:
je near .sortagain
pop edi
.nodirs
%ifndef __LINUX__
%ifndef __UNIXSDL__
cmp byte[GUIloadfntype],0
je near .drive2
mov esi,[GUInumentries]
@@ -1329,7 +1329,7 @@ GUIdirentries resd 1
GUIfileentries resd 0
SECTION .data
%ifdef __LINUX__
%ifdef __UNIXSDL__
NEWSYM GUIsmcfind, db '*.[sS][mM][cC]',0
NEWSYM GUIsfcfind, db '*.[sS][fF][cC]',0
NEWSYM GUIswcfind, db '*.[sS][wW][cC]',0
@@ -1348,7 +1348,7 @@ NEWSYM GUIgd3find, db '*.GD3',0
%endif
NEWSYM GUIfind058, db '*.058',0
NEWSYM GUIfind078, db '*.078',0
%ifdef __LINUX__
%ifdef __UNIXSDL__
NEWSYM GUIfindUSA, db '*.[uU][sS][aA]',0
NEWSYM GUIfindEUR, db '*.[eE][uU][rR]',0
NEWSYM GUIfindJAP, db '*.[jJ][aA][pP]',0
@@ -1366,7 +1366,7 @@ NEWSYM GUIfindJMA, db '*.JMA',0
NEWSYM GUIfindGZIP, db '*.GZ',0
%endif
NEWSYM GUIfind1, db '*.1',0
%ifdef __LINUX__
%ifdef __UNIXSDL__
GUIfindDIR db '*',0
NEWSYM GUIfindall, db '*',0
%else

10
zsnes/src/gui/guimouse.inc
View File

@@ -225,7 +225,7 @@ ProcessMouseButtons:
jb near .noclickedw
cmp word[GUImouseposx],242
ja .notfound7
%ifdef __LINUX__
%ifdef __UNIXSDL__
jmp .clickawn
%endif
cmp word[GUImouseposy],8
@@ -486,7 +486,7 @@ ProcessMouseButtons:
mov byte[GUIpclicked],0
mov byte[GUIHold],0
%ifdef __LINUX__
%ifdef __UNIXSDL__
cmp byte[GUIcwinpress],1
jne .notwinpressa
mov byte[GUIcwinpress],0
@@ -1178,7 +1178,7 @@ GUIWinClicked:
%%noclick
%endmacro
%ifndef __LINUX__
%ifndef __UNIXSDL__
%macro GUIClickCButton2r 5
cmp eax,%1+1
jl %%noclick
@@ -2376,7 +2376,7 @@ DisplayGUIVideoClick:
mov bl,[cvidmode]
cmp byte[GUISLVID+ebx],0
je near .nocheckboxb
%ifdef __LINUX__
%ifdef __UNIXSDL__
GUIClickCButton4 21,119,byte[scanlines],byte[cfgscanline],1
%else
GUIClickCButton4 21,114,byte[scanlines],byte[cfgscanline],1
@@ -2405,7 +2405,7 @@ DisplayGUIVideoClick:
mov bl,[cvidmode]
cmp byte[GUIHSVID+ebx],0
je near .nohsline
%ifdef __LINUX__
%ifdef __UNIXSDL__
GUIClickCButton4 61,119,byte[scanlines],byte[cfgscanline],3
GUIClickCButton4 101,119,byte[scanlines],byte[cfgscanline],2
%else

14
zsnes/src/gui/guiwindp.inc
View File

@@ -1437,7 +1437,7 @@ DisplayGUIVideo:
GUIDisplayText 5,10,92,GUIVideoTextB2
GUIDisplayText 5,10,99,GUIVideoTextB3
%endif
%ifdef __LINUX__
%ifdef __UNIXSDL__
GUIDisplayText 5,10,106,GUIVideoTextB4
%endif
@@ -1445,7 +1445,7 @@ DisplayGUIVideo:
mov al,[cvidmode]
cmp byte[GUISLVID+eax],0
je near .notext2
%ifdef __LINUX__
%ifdef __UNIXSDL__
GUIDisplayText 5,13,116,GUIVideoTextC
%else
GUIDisplayText 5,13,111,GUIVideoTextC
@@ -1505,7 +1505,7 @@ DisplayGUIVideo:
mov al,[cvidmode]
cmp byte[GUISLVID+eax],0
je near .nocheckboxb
%ifdef __LINUX__
%ifdef __UNIXSDL__
GUIDisplayCheckboxun 5,21,119,scanlines,1,GUIVideoTextC1,0
%elifdef __WIN32__
GUIDisplayCheckboxun 5,21,114,scanlines,1,GUIVideoTextC1,0
@@ -1516,12 +1516,12 @@ DisplayGUIVideo:
mov al,[cvidmode]
cmp byte[GUIHSVID+eax],0
je near .nocheckboxw
%ifdef __LINUX__
%ifdef __UNIXSDL__
GUIDisplayCheckboxun 5,61,119,scanlines,3,GUIVideoTextC2,0
%elifdef __WIN32__
GUIDisplayCheckboxun 5,61,114,scanlines,3,GUIVideoTextC2,0
%endif
%ifdef __LINUX__
%ifdef __UNIXSDL__
GUIDisplayCheckboxun 5,101,119,scanlines,2,GUIVideoTextC3,0
%elifdef __WIN32__
GUIDisplayCheckboxun 5,101,114,scanlines,2,GUIVideoTextC3,0
@@ -1576,7 +1576,7 @@ DisplayGUIVideo:
GUIDisplayCheckboxu 5,11,173,Mode7HiRes16b,GUIVideoText8b,0
.nocheckboxm72
GUIDisplayCheckboxu 5,11,183,GrayscaleMode,GUIVideoText8c,0
%ifndef __LINUX__
%ifndef __UNIXSDL__
GUIDisplayCheckboxu 5,115,183,vsyncon,GUIVideoText9,0
%endif
@@ -3063,7 +3063,7 @@ GUIGUIAboutTextA1 db 'ZSNES V',ZVERSION,' ',0 ;Need room for date
GUIGUIAboutTextA2 db 'DOS VERSION',0
%elifdef __WIN32__
GUIGUIAboutTextA2 db 'WIN VERSION',0
%elifdef __LINUX__
%elifdef __UNIXSDL__
GUIGUIAboutTextA2 db 'SDL VERSION',0
%endif