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

2
zsnes/src/Makefile.in
View File

@@ -96,7 +96,7 @@ PSR=parsegen
@NASMPATH@ @NFLAGS@ -o $@ $< @NASMPATH@ @NFLAGS@ -o $@ $<
%.o: %.psr %.o: %.psr
./${PSR} -D__LINUX__ temppsr.c $< ./${PSR} -D__UNIXSDL__ temppsr.c $<
@CC@ -I. -o $@ -c temppsr.c @CC@ -I. -o $@ -c temppsr.c
rm -f temppsr.c rm -f temppsr.c

6
zsnes/src/SConstruct
View File

@@ -12,7 +12,7 @@ def parsegen_emitter(target,source,env):
return (target,source) return (target,source)
if platform == 'posix': if platform == 'posix':
psrbld = Builder(action ='./parsegen -D__LINUX__ cfgparse.c', psrbld = Builder(action ='./parsegen -D__UNIXSDL__ cfgparse.c',
emitter = parsegen_emitter, emitter = parsegen_emitter,
suffix = '.c', src_suffix = '.psr') suffix = '.c', src_suffix = '.psr')
@@ -196,8 +196,8 @@ env = conf.Finish ()
# Perform any platform-specific initialization # Perform any platform-specific initialization
if platform == 'posix': if platform == 'posix':
src = chipssrc + netsrc + cpusrc + dossrc + effectssrc + guisrc + videosrc + zipsrc + jmasrc + linuxsrc src = chipssrc + netsrc + cpusrc + dossrc + effectssrc + guisrc + videosrc + zipsrc + jmasrc + linuxsrc
env.Append (CCFLAGS = '-D__LINUX__') env.Append (CCFLAGS = '-D__UNIXSDL__')
env.Append (ASFLAGS = '-DELF -D__LINUX__') env.Append (ASFLAGS = '-DELF -D__UNIXSDL__')
env.Append (CCFLAGS = '-I.') env.Append (CCFLAGS = '-I.')
env.Append (CCFLAGS = '-I/usr/include/SDL') env.Append (CCFLAGS = '-I/usr/include/SDL')

2
zsnes/src/asm_call.h
View File

@@ -49,7 +49,7 @@ I'd fix that if anyone knows if that parameter defines something I can check
#define ASM_COMMAND(line) #line"\n\t" #define ASM_COMMAND(line) #line"\n\t"
#ifdef __LINUX__ #ifdef __UNIXSDL__
#define ASM_CALL(func) ASM_COMMAND(call func) #define ASM_CALL(func) ASM_COMMAND(call func)
#else #else
#define ASM_CALL(func) ASM_COMMAND(call _ ## func) #define ASM_CALL(func) ASM_COMMAND(call _ ## func)

22
zsnes/src/cfgload.c
View File

@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "gblhdr.h" #include "gblhdr.h"
#else #else
#include <io.h> #include <io.h>
@@ -46,7 +46,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#ifdef __WIN32__ #ifdef __WIN32__
#define StringI "VIDEOMODEWIN" #define StringI "VIDEOMODEWIN"
#endif #endif
#ifdef __LINUX__ #ifdef __UNIXSDL__
#define StringI "VIDEOMODELIN" #define StringI "VIDEOMODELIN"
#endif #endif
#ifdef __MSDOS__ #ifdef __MSDOS__
@@ -145,7 +145,7 @@ extern unsigned int ZOpenFile(); //Create_File. Open_File
extern unsigned int ZFileWrite(); //Write_File(); extern unsigned int ZFileWrite(); //Write_File();
extern unsigned int ZCloseFile(); //Close_File extern unsigned int ZCloseFile(); //Close_File
#ifdef __LINUX__ #ifdef __UNIXSDL__
extern char zcfgdir[1024]; extern char zcfgdir[1024];
unsigned char cfgloadsdir = 1; //Set to yes, since savedir is always set and considered to be changed unsigned char cfgloadsdir = 1; //Set to yes, since savedir is always set and considered to be changed
#else #else
@@ -374,7 +374,7 @@ void DOScreatenewcfg()
return; return;
} }
#ifdef __LINUX__ #ifdef __UNIXSDL__
chdir(zcfgdir); chdir(zcfgdir);
#endif #endif
@@ -450,7 +450,7 @@ void DOScreatenewcfg()
sprintf(buffer, "VideoModeWin = %d\r\n\r\n", cfgcvidmode); sprintf(buffer, "VideoModeWin = %d\r\n\r\n", cfgcvidmode);
SAVE_LINE(buffer); SAVE_LINE(buffer);
#endif #endif
#ifdef __LINUX__ #ifdef __UNIXSDL__
#ifdef __OPENGL__ #ifdef __OPENGL__
WRITE_LINE("; Video Mode, 0 - 18\r\n"); WRITE_LINE("; Video Mode, 0 - 18\r\n");
#else #else
@@ -535,7 +535,7 @@ void DOScreatenewcfg()
sprintf(buffer, "\r\nInterpolation = %d\r\n\r\n", cfginterp); sprintf(buffer, "\r\nInterpolation = %d\r\n\r\n", cfginterp);
SAVE_LINE(buffer); SAVE_LINE(buffer);
#ifndef __LINUX__ #ifndef __UNIXSDL__
WRITE_LINE("; VSync (1 = Enable, 0 = Disable) - Wait for Vertical Sync (Fast cpu reqd)\r\n\r\n"); WRITE_LINE("; VSync (1 = Enable, 0 = Disable) - Wait for Vertical Sync (Fast cpu reqd)\r\n\r\n");
sprintf(buffer, "VSync = %d\r\n\r\n", cfgvsync); sprintf(buffer, "VSync = %d\r\n\r\n", cfgvsync);
SAVE_LINE(buffer); SAVE_LINE(buffer);
@@ -582,7 +582,7 @@ void DOScreatenewcfg()
if (DontSavePath != 1) if (DontSavePath != 1)
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
sprintf(buffer, "GameDirectory = %s\r\n\r\n", LoadDir); sprintf(buffer, "GameDirectory = %s\r\n\r\n", LoadDir);
#else #else
sprintf(buffer, "GameDirectory = %c:\\%s\r\n", (char) (*LoadDrive + 65), LoadDir); sprintf(buffer, "GameDirectory = %c:\\%s\r\n", (char) (*LoadDrive + 65), LoadDir);
@@ -590,7 +590,7 @@ void DOScreatenewcfg()
} }
else else
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
sprintf(buffer, "GameDirectory = %s\r\n\r\n", LoadDirB); sprintf(buffer, "GameDirectory = %s\r\n\r\n", LoadDirB);
#else #else
sprintf(buffer, "GameDirectory = %c:\\%s\r\n", (char) (*LoadDriveB + 65), LoadDirB); sprintf(buffer, "GameDirectory = %c:\\%s\r\n", (char) (*LoadDriveB + 65), LoadDirB);
@@ -709,7 +709,7 @@ void getcfg()
temp = _string[i]; temp = _string[i];
if (_usespace || temp != ' ') if (_usespace || temp != ' ')
{ {
#ifndef __LINUX__ #ifndef __UNIXSDL__
if (temp >= 'a' && temp <= 'z') if (temp >= 'a' && temp <= 'z')
temp -= ('a' - 'A'); temp -= ('a' - 'A');
#endif #endif
@@ -1254,7 +1254,7 @@ void getcfg()
{ {
if (_strlenb >= 3) if (_strlenb >= 3)
{ {
#ifndef __LINUX__ #ifndef __UNIXSDL__
if (_stringb[1] == ':' && _stringb[2] == '\\') if (_stringb[1] == ':' && _stringb[2] == '\\')
{ {
cfgloadgdir = 1; cfgloadgdir = 1;
@@ -1270,7 +1270,7 @@ void getcfg()
#endif #endif
strcpy(LoadDirB, LoadDir); strcpy(LoadDirB, LoadDir);
#ifndef __LINUX__ #ifndef __UNIXSDL__
} }
#endif #endif
} }

2
zsnes/src/cfgparse.psr
View File

@@ -185,7 +185,7 @@ prevloadfnamel times 512*10 db 0
%ifdef __WIN32__ %ifdef __WIN32__
NEWSYM PrevWinMode, db 2 NEWSYM PrevWinMode, db 2
NEWSYM PrevFSMode, db 6 NEWSYM PrevFSMode, db 6
%elifdef __LINUX__ %elifdef __UNIXSDL__
NEWSYM PrevWinMode, db 2 NEWSYM PrevWinMode, db 2
NEWSYM PrevFSMode, db 3 NEWSYM PrevFSMode, db 3
%elifdef __MSDOS__ %elifdef __MSDOS__

2
zsnes/src/chips/c4emu.c
View File

@@ -20,7 +20,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "../gblhdr.h" #include "../gblhdr.h"
#else #else
#include <math.h> #include <math.h>

2
zsnes/src/chips/dsp1emu.c
View File

@@ -23,7 +23,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#define __ZSNES__ #define __ZSNES__
#if (defined __ZSNES__ && __LINUX__) #if (defined __ZSNES__ && __UNIXSDL__)
#include "../gblhdr.h" #include "../gblhdr.h"
#else #else

2
zsnes/src/chips/seta10.c
View File

@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
//http://users.tpg.com.au/trauma/dsp/st010.html //http://users.tpg.com.au/trauma/dsp/st010.html
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "gblhdr.h" #include "gblhdr.h"
#else #else
#include <math.h> //sqrt() #include <math.h> //sqrt()

20
zsnes/src/configure.in
View File

@@ -30,24 +30,24 @@ NFLAGS="$NFLAGS -w-orphan-labels"
AC_PROG_INSTALL AC_PROG_INSTALL
case "$target" in case "$target" in
*-*-linux*) *-*-linux*)
CFLAGS="$CFLAGS -D__LINUX__" CFLAGS="$CFLAGS -D__UNIXSDL__"
NFLAGS="$NFLAGS -D__LINUX__ -f elf -DELF" NFLAGS="$NFLAGS -D__UNIXSDL__ -f elf -DELF"
;; ;;
*-*-beos*) *-*-beos*)
CFLAGS="$CFLAGS -D__LINUX__ -D__BEOS__" CFLAGS="$CFLAGS -D__UNIXSDL__ -D__BEOS__"
NFLAGS="$NFLAGS -D__LINUX__ -D__BEOS__ -f elf -DELF" NFLAGS="$NFLAGS -D__UNIXSDL__ -D__BEOS__ -f elf -DELF"
;; ;;
*-*-*openbsd*) *-*-*openbsd*)
CFLAGS="$CFLAGS -D__LINUX__ -D__FreeBSD__" CFLAGS="$CFLAGS -D__UNIXSDL__ -D__FreeBSD__"
NFLAGS="$NFLAGS -D__LINUX__ -D__FreeBSD__ -DELF -f elf" NFLAGS="$NFLAGS -D__UNIXSDL__ -D__FreeBSD__ -DELF -f elf"
;; ;;
*-*-*bsd*) *-*-*bsd*)
CFLAGS="$CFLAGS -D__LINUX__ -D__FreeBSD__" CFLAGS="$CFLAGS -D__UNIXSDL__ -D__FreeBSD__"
NFLAGS="$NFLAGS -D__LINUX__ -D__FreeBSD__ -DELF -f elf" NFLAGS="$NFLAGS -D__UNIXSDL__ -D__FreeBSD__ -DELF -f elf"
;; ;;
*-*-cygwin* | *-*-*ming*) *-*-cygwin* | *-*-*ming*)
CFLAGS="$CFLAGS -D__LINUX__" CFLAGS="$CFLAGS -D__UNIXSDL__"
NFLAGS="$NFLAGS -D__LINUX__ -f win32" NFLAGS="$NFLAGS -D__UNIXSDL__ -f win32"
;; ;;
*) *)
AC_MSG_ERROR(This Target is Not Supported) AC_MSG_ERROR(This Target is Not Supported)

2
zsnes/src/cpu/executec.c
View File

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

2
zsnes/src/cpu/memtable.c
View File

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

2
zsnes/src/debug.c
View File

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

2
zsnes/src/effects/water.c
View File

@@ -20,7 +20,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "../gblhdr.h" #include "../gblhdr.h"
#else #else
#include <stdlib.h> #include <stdlib.h>

4
zsnes/src/gblhdr.h
View File

@@ -93,7 +93,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#define getpagesize() 4096 #define getpagesize() 4096
#endif #endif
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "SDL.h" #include "SDL.h"
#include <limits.h> #include <limits.h>
#ifndef __BEOS__ #ifndef __BEOS__
@@ -114,7 +114,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#endif #endif
#endif #endif
#ifdef __LINUX__ #ifdef __UNIXSDL__
#if !defined(__FreeBSD__) && !defined(__BEOS__) #if !defined(__FreeBSD__) && !defined(__BEOS__)
#include <asm/ioctls.h> #include <asm/ioctls.h>
#else #else

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 GUIEnableTransp,FilteredGUI,MouseWheel,TrapMouseCursor,AlwaysOnTop
EXTSYM pl1p209,pl1p209b,SaveMainWindowPos,FastFwdToggle,SidewinderFix,RaisePitch EXTSYM pl1p209,pl1p209b,SaveMainWindowPos,FastFwdToggle,SidewinderFix,RaisePitch
%ifdef __LINUX__ %ifdef __UNIXSDL__
EXTSYM numlockptr EXTSYM numlockptr
%endif %endif
%ifdef __WIN32__ %ifdef __WIN32__
@@ -1843,7 +1843,7 @@ guipostvideofail:
call GUIUnBuffer call GUIUnBuffer
call DisplayBoxes call DisplayBoxes
call DisplayMenu call DisplayMenu
%ifndef __LINUX__ %ifndef __UNIXSDL__
mov dword[GUIkeydelay],0FFFFFFFFh mov dword[GUIkeydelay],0FFFFFFFFh
%else %else
mov dword[GUIkeydelay],0x0 mov dword[GUIkeydelay],0x0
@@ -2626,7 +2626,7 @@ DisplayMenu:
GUIBox 0,14,229,14,70 GUIBox 0,14,229,14,70
GUIBox 0,15,229,15,71 GUIBox 0,15,229,15,71
%ifdef __LINUX__ %ifdef __UNIXSDL__
GUIShadow 238,9,247,20 GUIShadow 238,9,247,20
GUIShadow 249,9,257,20 GUIShadow 249,9,257,20
%endif %endif
@@ -2637,7 +2637,7 @@ DisplayMenu:
%endif %endif
.notwinpressa .notwinpressa
%ifdef __LINUX__ %ifdef __UNIXSDL__
mov byte[GUIMenuItem+36],247 mov byte[GUIMenuItem+36],247
GUIDMHelpB 233,242,GUIMenuItem+36,1 GUIDMHelpB 233,242,GUIMenuItem+36,1
mov byte[GUIMenuItem+36],'x' 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" #include "gblhdr.h"
#define DIR_SLASH "/" #define DIR_SLASH "/"
#else #else

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

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

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

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

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

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

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

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

14
zsnes/src/init.asm
View File

@@ -63,7 +63,7 @@ EXTSYM clearmem,clearSPCRAM,PatchUsingIPS,ZOpenFileName,loadROM,SPC7110IndexSize
EXTSYM SPC7PackIndexLoad,IntlEHi,C4Enable,SPC7110Enable,RTCEnable,SA1Enable EXTSYM SPC7PackIndexLoad,IntlEHi,C4Enable,SPC7110Enable,RTCEnable,SA1Enable
EXTSYM SDD1Enable,OBCEnable,SFXEnable,BSEnable,clearvidsound,headerhack,SetupROM EXTSYM SDD1Enable,OBCEnable,SFXEnable,BSEnable,clearvidsound,headerhack,SetupROM
%ifdef __LINUX__ %ifdef __UNIXSDL__
EXTSYM LoadDir,popdir,pushdir EXTSYM LoadDir,popdir,pushdir
%endif %endif
@@ -229,7 +229,7 @@ NEWSYM init
; as not to break any other code later on which depends ; as not to break any other code later on which depends
; on it being present. ; on it being present.
mov ebx,[statefileloc] mov ebx,[statefileloc]
%ifdef __LINUX__ %ifdef __UNIXSDL__
mov word[fnamest+ebx-1],'st' mov word[fnamest+ebx-1],'st'
%else %else
mov word[fnamest+ebx-1],'ST' mov word[fnamest+ebx-1],'ST'
@@ -2120,7 +2120,7 @@ NEWSYM printhex8
; Search for header size first which is filesize MOD 32768 ; Search for header size first which is filesize MOD 32768
NEWSYM PatchIPS NEWSYM PatchIPS
%ifdef __LINUX__ %ifdef __UNIXSDL__
pushad pushad
call pushdir call pushdir
popad popad
@@ -2138,7 +2138,7 @@ NEWSYM PatchIPS
dec eax dec eax
cmp eax,fname cmp eax,fname
je .failfound je .failfound
%ifdef __LINUX__ %ifdef __UNIXSDL__
cmp byte[eax],'/' cmp byte[eax],'/'
%else %else
cmp byte[eax],'\' cmp byte[eax],'\'
@@ -2155,7 +2155,7 @@ NEWSYM PatchIPS
mov dword[eax],'.ips' mov dword[eax],'.ips'
mov byte[eax+4],0 mov byte[eax+4],0
push eax push eax
%ifdef __LINUX__ %ifdef __UNIXSDL__
cmp byte [ZipSupport], 1 cmp byte [ZipSupport], 1
je .nochangedir je .nochangedir
mov ebx,LoadDir mov ebx,LoadDir
@@ -2170,7 +2170,7 @@ NEWSYM PatchIPS
pop eax pop eax
mov ebx,[Prevextn] mov ebx,[Prevextn]
mov [eax],ebx mov [eax],ebx
%ifdef __LINUX__ %ifdef __UNIXSDL__
pushad pushad
call popdir call popdir
popad popad
@@ -2269,7 +2269,7 @@ NEWSYM loadfile
mov byte[TextFile], 0 mov byte[TextFile], 0
call GetCurDir call GetCurDir
mov byte[InGUI],0 mov byte[InGUI],0
%ifdef __LINUX__ %ifdef __UNIXSDL__
mov dl,[InitDrive] mov dl,[InitDrive]
mov ebx,InitDir mov ebx,InitDir
call Change_Dir call Change_Dir

2
zsnes/src/initc.c
View File

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

8
zsnes/src/linux/sdlintrf.asm
View File

@@ -81,7 +81,7 @@ NEWSYM SystemInit
mov byte[cfgsoundon],1 mov byte[cfgsoundon],1
; Get and set the initial directory ; Get and set the initial directory
%ifdef __LINUX__ %ifdef __UNIXSDL__
call obtaindir call obtaindir
mov ebx,InitDir mov ebx,InitDir
mov edx,InitDrive mov edx,InitDrive
@@ -901,7 +901,7 @@ NEWSYM ScanCodeListing
db ' " ',' ~ ','LSH',' \ ',' Z ',' X ',' C ',' V ' db ' " ',' ~ ','LSH',' \ ',' Z ',' X ',' C ',' V '
db ' B ',' N ',' M ',' , ',' . ',' / ','RSH',' * ' ; 30h db ' B ',' N ',' M ',' , ',' . ',' / ','RSH',' * ' ; 30h
db 'LAL','SPC','CAP','F1 ','F2 ','F3 ','F4 ','F5 ' db 'LAL','SPC','CAP','F1 ','F2 ','F3 ','F4 ','F5 '
%ifdef __LINUX__ %ifdef __UNIXSDL__
db 'F6 ','F7 ','F8 ','F9 ','F10','NUM','SCR','KP7' ; 40h db 'F6 ','F7 ','F8 ','F9 ','F10','NUM','SCR','KP7' ; 40h
db 'KP8','KP9','KP-','KP4','KP5','KP6','KP+','KP1' db 'KP8','KP9','KP-','KP4','KP5','KP6','KP+','KP1'
db 'KP2','KP3','KP0','KP.',' ',' ','OEM','F11' ; 50h db 'KP2','KP3','KP0','KP.',' ',' ','OEM','F11' ; 50h
@@ -951,7 +951,7 @@ NEWSYM ScanCodeListing
db 'J68','J69','J6A','J6B','J6C','J6D','J6E','J6F' db 'J68','J69','J6A','J6B','J6C','J6D','J6E','J6F'
db 'J70','J71','J72','J73','J74','J75','J76','J77' ; 170h db 'J70','J71','J72','J73','J74','J75','J76','J77' ; 170h
db 'J78','J79','J7A','J7B','J7C','J7D','J7E','J7F' db 'J78','J79','J7A','J7B','J7C','J7D','J7E','J7F'
%ifdef __LINUX__ %ifdef __UNIXSDL__
; Extra Joystick Stuff ; Extra Joystick Stuff
db 'J80','J81','J82','J83','J84','J85','J86','J87' ; 180h db 'J80','J81','J82','J83','J84','J85','J86','J87' ; 180h
db 'J88','J89','J8A','J8B','J8C','J8D','J8E','J8F' db 'J88','J89','J8A','J8B','J8C','J8D','J8E','J8F'
@@ -1241,7 +1241,7 @@ NEWSYM SetInputDevice
je near .input2 je near .input2
mov dword[eax],54 mov dword[eax],54
mov dword[eax+4],28 mov dword[eax+4],28
%ifdef __LINUX__ %ifdef __UNIXSDL__
mov dword[eax+8],90 mov dword[eax+8],90
mov dword[eax+12],96 mov dword[eax+12],96
mov dword[eax+16],92 mov dword[eax+16],92

16
zsnes/src/linux/zfilew.c
View File

@@ -28,7 +28,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#include <zlib.h> #include <zlib.h>
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <sys/time.h> #include <sys/time.h>
@@ -44,7 +44,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#define DWORD unsigned int #define DWORD unsigned int
#define BYTE unsigned char #define BYTE unsigned char
#ifdef __LINUX__ #ifdef __UNIXSDL__
#define STUB_FUNCTION fprintf(stderr,"STUB: %s at " __FILE__ ", line %d, thread %d\n",__FUNCTION__,__LINE__,getpid()) #define STUB_FUNCTION fprintf(stderr,"STUB: %s at " __FILE__ ", line %d, thread %d\n",__FUNCTION__,__LINE__,getpid())
#endif #endif
#include <errno.h> #include <errno.h>
@@ -260,7 +260,7 @@ DWORD ZFileGetFTime()
DWORD ZFileMKDir() DWORD ZFileMKDir()
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
return(mkdir(MKPath, (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH))); return(mkdir(MKPath, (S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)));
#else #else
return(mkdir(MKPath)); return(mkdir(MKPath));
@@ -298,7 +298,7 @@ DWORD DTALocPos;
int TempFind; int TempFind;
#ifndef __LINUX__ #ifndef __UNIXSDL__
int FindFirstHandle; int FindFirstHandle;
struct _finddata_t FindDataStruct; struct _finddata_t FindDataStruct;
#else #else
@@ -309,7 +309,7 @@ int globcur;
DWORD ZFileFindNext() DWORD ZFileFindNext()
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
//STUB_FUNCTION; //STUB_FUNCTION;
struct stat filetype; struct stat filetype;
@@ -357,7 +357,7 @@ DWORD ZFileFindNext()
DWORD ZFileFindFirst() DWORD ZFileFindFirst()
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
//STUB_FUNCTION; //STUB_FUNCTION;
struct stat filetype; struct stat filetype;
@@ -405,7 +405,7 @@ DWORD ZFileFindFirst()
DWORD ZFileFindEnd() // for compatibility with windows later DWORD ZFileFindEnd() // for compatibility with windows later
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
//STUB_FUNCTION; //STUB_FUNCTION;
if (globcur != -1) { if (globcur != -1) {
globfree(&globbuf); globfree(&globbuf);
@@ -461,7 +461,7 @@ DWORD GetDate()
extern char SRAMDir[1024]; extern char SRAMDir[1024];
extern char LoadDir[512]; extern char LoadDir[512];
#ifdef __LINUX__ #ifdef __UNIXSDL__
char zcfgdir[1024]; char zcfgdir[1024];
#define ZCFG_DIR "/.zsnes" #define ZCFG_DIR "/.zsnes"

36
zsnes/src/net/ztcp.c
View File

@@ -86,7 +86,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
// only be done if the requested packet is within the past 64 packets. // only be done if the requested packet is within the past 64 packets.
// In-game chat will be moved to a separate packet in TCP/IP // In-game chat will be moved to a separate packet in TCP/IP
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "gblhdr.h" #include "gblhdr.h"
#define closesocket(A) close(A) #define closesocket(A) close(A)
#define CopyMemory(A,B,C) memcpy(A,B,C) #define CopyMemory(A,B,C) memcpy(A,B,C)
@@ -186,14 +186,14 @@ int GetLeftUDP();
int InitTCP() int InitTCP()
{ {
#ifndef __LINUX__ #ifndef __UNIXSDL__
WORD versionneeded = MAKEWORD(2,2); WORD versionneeded = MAKEWORD(2,2);
WSADATA wsadata; WSADATA wsadata;
#endif #endif
UDPEnable=0; UDPEnable=0;
#ifndef __LINUX__ #ifndef __UNIXSDL__
/* Startup winsock */ /* Startup winsock */
WSAStartup(versionneeded, &wsadata); WSAStartup(versionneeded, &wsadata);
@@ -217,7 +217,7 @@ int InitTCP()
void DeInitTCP() void DeInitTCP()
{ {
#ifndef __LINUX__ #ifndef __UNIXSDL__
WSACleanup(); WSACleanup();
#endif #endif
} }
@@ -337,7 +337,7 @@ int ConnectServer(char *servername, unsigned int port)
if (ugamesocket == INVALID_SOCKET) if (ugamesocket == INVALID_SOCKET)
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
STUB_FUNCTION; STUB_FUNCTION;
#else #else
tcperr=WSAGetLastError(); tcperr=WSAGetLastError();
@@ -349,7 +349,7 @@ int ConnectServer(char *servername, unsigned int port)
if (userversocket == INVALID_SOCKET) if (userversocket == INVALID_SOCKET)
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
STUB_FUNCTION; STUB_FUNCTION;
#else #else
tcperr=WSAGetLastError(); tcperr=WSAGetLastError();
@@ -362,7 +362,7 @@ int ConnectServer(char *servername, unsigned int port)
if (bind(userversocket,(struct sockaddr*)&userveraddress,sizeof(userveraddress))== if (bind(userversocket,(struct sockaddr*)&userveraddress,sizeof(userveraddress))==
SOCKET_ERROR) SOCKET_ERROR)
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
STUB_FUNCTION; STUB_FUNCTION;
#else #else
tcperr=WSAGetLastError(); tcperr=WSAGetLastError();
@@ -420,7 +420,7 @@ int ConnectServer(char *servername, unsigned int port)
sizeof(struct sockaddr)); sizeof(struct sockaddr));
if (retval == SOCKET_ERROR) if (retval == SOCKET_ERROR)
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
STUB_FUNCTION; STUB_FUNCTION;
#else #else
sprintf(blah,"Could not connect to other side"); sprintf(blah,"Could not connect to other side");
@@ -524,7 +524,7 @@ int StartServerCycle(unsigned short port)
if (userversocket == INVALID_SOCKET) if (userversocket == INVALID_SOCKET)
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
STUB_FUNCTION; STUB_FUNCTION;
#else #else
tcperr=WSAGetLastError(); tcperr=WSAGetLastError();
@@ -536,7 +536,7 @@ int StartServerCycle(unsigned short port)
if (bind(userversocket,(struct sockaddr*)&userveraddress,sizeof(userveraddress))== if (bind(userversocket,(struct sockaddr*)&userveraddress,sizeof(userveraddress))==
SOCKET_ERROR) SOCKET_ERROR)
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
STUB_FUNCTION; STUB_FUNCTION;
#else #else
tcperr=WSAGetLastError(); tcperr=WSAGetLastError();
@@ -572,7 +572,7 @@ int StartServerCycle(unsigned short port)
serversocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); serversocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
if (serversocket == INVALID_SOCKET) if (serversocket == INVALID_SOCKET)
{ {
#ifndef __LINUX__ #ifndef __UNIXSDL__
tcperr=WSAGetLastError(); tcperr=WSAGetLastError();
#endif #endif
@@ -589,7 +589,7 @@ int StartServerCycle(unsigned short port)
sizeof(struct sockaddr)); sizeof(struct sockaddr));
if (retval == SOCKET_ERROR) if (retval == SOCKET_ERROR)
{ {
#ifndef __LINUX__ #ifndef __UNIXSDL__
tcperr=WSAGetLastError(); tcperr=WSAGetLastError();
#endif #endif
closesocket(serversocket); closesocket(serversocket);
@@ -600,7 +600,7 @@ int StartServerCycle(unsigned short port)
retval = listen(serversocket, SOMAXCONN); retval = listen(serversocket, SOMAXCONN);
if (retval == SOCKET_ERROR) if (retval == SOCKET_ERROR)
{ {
#ifndef __LINUX__ #ifndef __UNIXSDL__
tcperr=WSAGetLastError(); tcperr=WSAGetLastError();
#endif #endif
closesocket(serversocket); closesocket(serversocket);
@@ -622,7 +622,7 @@ int acceptzuser()
gamesocket = accept(serversocket, NULL, NULL); gamesocket = accept(serversocket, NULL, NULL);
if (gamesocket == INVALID_SOCKET) if (gamesocket == INVALID_SOCKET)
{ {
#ifndef __LINUX__ #ifndef __UNIXSDL__
tcperr=WSAGetLastError(); tcperr=WSAGetLastError();
#endif #endif
closesocket(serversocket); closesocket(serversocket);
@@ -668,7 +668,7 @@ int ServerCheckNewClient()
if(r == -1) if(r == -1)
{ {
#ifndef __LINUX__ #ifndef __UNIXSDL__
tcperr=WSAGetLastError(); tcperr=WSAGetLastError();
#endif #endif
return(-2); return(-2);
@@ -1236,7 +1236,7 @@ void UDPDisableMode(){
} }
void WinErrorA2(void){ void WinErrorA2(void){
#ifdef __LINUX__ #ifdef __UNIXSDL__
STUB_FUNCTION; STUB_FUNCTION;
#else #else
char message1[256]; char message1[256];
@@ -1246,7 +1246,7 @@ void WinErrorA2(void){
} }
void WinErrorB2(void){ void WinErrorB2(void){
#ifdef __LINUX__ #ifdef __UNIXSDL__
STUB_FUNCTION; STUB_FUNCTION;
#else #else
char message1[256]; char message1[256];
@@ -1256,7 +1256,7 @@ void WinErrorB2(void){
} }
void WinErrorC2(void){ void WinErrorC2(void){
#ifdef __LINUX__ #ifdef __UNIXSDL__
STUB_FUNCTION; STUB_FUNCTION;
#else #else
char message1[256]; char message1[256];

2
zsnes/src/parsegen.cpp
View File

@@ -1013,7 +1013,7 @@ int main(size_t argc, const char **argv)
<< "\n" << "\n"
<< "Options:\n" << "Options:\n"
<< "\n" << "\n"
<< " -Ddefine Define a processor director. Example: -D__LINUX__\n" << " -Ddefine Define a processor director. Example: -D__UNIXSDL__\n"
<< " Can specify multiple defines.\n" << " Can specify multiple defines.\n"
<< "\n" << "\n"
<< " -cheader Create a C/C++ header with the following name.\n" << " -cheader Create a C/C++ header with the following name.\n"

2
zsnes/src/patch.c
View File

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

22
zsnes/src/ui.asm
View File

@@ -32,7 +32,7 @@ EXTSYM vidbufferofsb,headdata,romdata,sfxramdata,setaramdata,wramdata,ram7f,vram
EXTSYM sram,debugbuf,regptr,regptw,vcache2b,vcache4b,vcache8b,fname,fnames EXTSYM sram,debugbuf,regptr,regptw,vcache2b,vcache4b,vcache8b,fname,fnames
EXTSYM fnamest,filefound,vidbufferofsc,Sup48mbit,Sup16mbit,guioff EXTSYM fnamest,filefound,vidbufferofsc,Sup48mbit,Sup16mbit,guioff
%ifdef __LINUX__ %ifdef __UNIXSDL__
EXTSYM LinuxExit,GetFilename EXTSYM LinuxExit,GetFilename
%endif %endif
@@ -107,7 +107,7 @@ SECTION .text
;******************************************************* ;*******************************************************
NEWSYM AllocMem NEWSYM AllocMem
%ifndef __LINUX__ %ifndef __UNIXSDL__
mov ax,0501h mov ax,0501h
mov cx,bx mov cx,bx
shr ebx,16 shr ebx,16
@@ -192,7 +192,7 @@ NEWSYM getcmdline
.next2 .next2
cmp eax,edi cmp eax,edi
je .nomore je .nomore
%ifdef __LINUX__ %ifdef __UNIXSDL__
cmp byte[eax],'/' cmp byte[eax],'/'
%else %else
cmp byte[eax],'\' cmp byte[eax],'\'
@@ -303,7 +303,7 @@ SECTION .text
AllocateLDTDescriptor: AllocateLDTDescriptor:
%ifndef __LINUX__ %ifndef __UNIXSDL__
;Get ZSNES Base ;Get ZSNES Base
mov ax,ds mov ax,ds
mov bx,ax mov bx,ax
@@ -320,7 +320,7 @@ AllocateLDTDescriptor:
AllocateBlock: AllocateBlock:
%ifndef __LINUX__ %ifndef __UNIXSDL__
mov eax,0501h mov eax,0501h
mov bx,[BlockSize+2] mov bx,[BlockSize+2]
mov cx,[BlockSize] mov cx,[BlockSize]
@@ -635,7 +635,7 @@ NEWSYM makeextension
.loopz .loopz
dec edx dec edx
mov al,[fnames+edx] mov al,[fnames+edx]
%ifdef __LINUX__ %ifdef __UNIXSDL__
cmp al, '/' cmp al, '/'
%else %else
cmp al,'\' cmp al,'\'
@@ -667,7 +667,7 @@ NEWSYM makeextension
add ah,4 add ah,4
mov [fnames],ah mov [fnames],ah
mov [fnamest],ah mov [fnamest],ah
%ifdef __LINUX__ %ifdef __UNIXSDL__
pushad pushad
call GetFilename call GetFilename
popad popad
@@ -791,7 +791,7 @@ SECTION .data
SECTION .text SECTION .text
%ifndef __LINUX__ %ifndef __UNIXSDL__
NEWSYM obtaindir NEWSYM obtaindir
cmp byte[cfgloadsdir],1 cmp byte[cfgloadsdir],1
je .nosdriveb je .nosdriveb
@@ -818,7 +818,7 @@ NEWSYM preparedir
; DS:ESI -> 64 byte buffer to receive ASCIZ pathname ; DS:ESI -> 64 byte buffer to receive ASCIZ pathname
; get current drive, ah = 19h, al = A=0,B=1, etc. ; get current drive, ah = 19h, al = A=0,B=1, etc.
%ifndef __LINUX__ %ifndef __UNIXSDL__
cmp byte[cfgloadsdir],0 cmp byte[cfgloadsdir],0
je near .nosdrivec je near .nosdrivec
; verify sram drive/directory exists ; verify sram drive/directory exists
@@ -867,7 +867,7 @@ SECTION .data
NEWSYM InitDrive, db 2 NEWSYM InitDrive, db 2
NEWSYM LoadDrive, db 2 NEWSYM LoadDrive, db 2
%ifdef __LINUX__ %ifdef __UNIXSDL__
NEWSYM gotoroot, db '/',0 NEWSYM gotoroot, db '/',0
%else %else
NEWSYM gotoroot, db '\',0 NEWSYM gotoroot, db '\',0
@@ -882,7 +882,7 @@ SECTION .text
NEWSYM DosExit ; Terminate Program NEWSYM DosExit ; Terminate Program
%ifdef __WIN32__ %ifdef __WIN32__
call OSExit call OSExit
%elifdef __LINUX__ %elifdef __UNIXSDL__
call LinuxExit call LinuxExit
%elifdef __MSDOS__ %elifdef __MSDOS__
call init18_2hz call init18_2hz

2
zsnes/src/uic.c
View File

@@ -21,7 +21,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "gblhdr.h" #include "gblhdr.h"
#else #else
#include <stdio.h> #include <stdio.h>

8
zsnes/src/video/procvid.asm
View File

@@ -2131,7 +2131,7 @@ NEWSYM testpressed8b
mov byte[pressed+77],2 mov byte[pressed+77],2
.noright .noright
%ifndef __MSDOS__ %ifndef __MSDOS__
%ifdef __LINUX__ %ifdef __UNIXSDL__
test byte[pressed+92],1 test byte[pressed+92],1
%else %else
test byte[pressed+0CBh],1 test byte[pressed+0CBh],1
@@ -2140,13 +2140,13 @@ NEWSYM testpressed8b
cmp bl,0 cmp bl,0
je .noleft2 je .noleft2
dec bl dec bl
%ifdef __LINUX__ %ifdef __UNIXSDL__
mov byte[pressed+92],2 mov byte[pressed+92],2
%else %else
mov byte[pressed+0CBh],2 mov byte[pressed+0CBh],2
%endif %endif
.noleft2 .noleft2
%ifdef __LINUX__ %ifdef __UNIXSDL__
test byte[pressed+94],1 test byte[pressed+94],1
%else %else
test byte[pressed+0CDh],1 test byte[pressed+0CDh],1
@@ -2155,7 +2155,7 @@ NEWSYM testpressed8b
cmp bl,9 cmp bl,9
je .noright2 je .noright2
inc bl inc bl
%ifdef __LINUX__ %ifdef __UNIXSDL__
mov byte[pressed+94],2 mov byte[pressed+94],2
%else %else
mov byte[pressed+0CDh],2 mov byte[pressed+0CDh],2

2
zsnes/src/video/procvidc.c
View File

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

2
zsnes/src/zip/unzip.c
View File

@@ -4,7 +4,7 @@
Read unzip.h for more info Read unzip.h for more info
*/ */
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "../gblhdr.h" #include "../gblhdr.h"
#else #else
#include <stdio.h> #include <stdio.h>

8
zsnes/src/zip/zpng.c
View File

@@ -18,7 +18,7 @@
#include <stdlib.h> #include <stdlib.h>
#endif #endif
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "../gblhdr.h" #include "../gblhdr.h"
#endif #endif
@@ -127,7 +127,7 @@ char *generate_filename(void)
short i=0; short i=0;
struct stat buf; struct stat buf;
char *tmp = &fnames; char *tmp = &fnames;
#ifdef __LINUX__ #ifdef __UNIXSDL__
char *tmp2 = 0; char *tmp2 = 0;
#endif #endif
@@ -156,7 +156,7 @@ char *generate_filename(void)
tmp = filename+strlen(filename); tmp = filename+strlen(filename);
while (*tmp!='.') tmp--; while (*tmp!='.') tmp--;
#ifdef __LINUX__ #ifdef __UNIXSDL__
tmp2 = filename; tmp2 = filename;
while (tmp2<tmp) { while (tmp2<tmp) {
if (*tmp2 == ' ') *tmp2 = '_'; if (*tmp2 == ' ') *tmp2 = '_';
@@ -170,7 +170,7 @@ char *generate_filename(void)
for(i=0;i<10000;i++) for(i=0;i<10000;i++)
{ {
#ifdef __LINUX__ #ifdef __UNIXSDL__
sprintf(tmp, "_%04d.png", i); sprintf(tmp, "_%04d.png", i);
#else #else
sprintf(tmp, " %04d.png", i); sprintf(tmp, " %04d.png", i);

2
zsnes/src/zip/zpng.h
View File

@@ -12,7 +12,7 @@
typedef enum {false, true} bool; typedef enum {false, true} bool;
#endif #endif
//#define __UPSIDE_DOWN__ /*define if pngs are saved upside down*/ //#define __UPSIDE_DOWN__ /*define if pngs are saved upside down*/
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "../gblhdr.h" #include "../gblhdr.h"
#else #else
#include <png.h> #include <png.h>

10
zsnes/src/zloader.c
View File

@@ -20,7 +20,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "gblhdr.h" #include "gblhdr.h"
#define DIR_SLASH '/' #define DIR_SLASH '/'
#else #else
@@ -139,7 +139,7 @@ static void display_help()
put_line(" 30 = 1280x1024 S FULL 31 = 1280x1024 DR FULL"); put_line(" 30 = 1280x1024 S FULL 31 = 1280x1024 DR FULL");
put_line(" 32 = 1280x1024 DS FULL"); put_line(" 32 = 1280x1024 DS FULL");
#endif #endif
#ifdef __LINUX__ #ifdef __UNIXSDL__
put_line(" 0 = 256x224 R WIN 1 = 256x224 R FULL"); put_line(" 0 = 256x224 R WIN 1 = 256x224 R FULL");
put_line(" 2 = 512x448 DR WIN 3 = 640x480 DS FULL"); put_line(" 2 = 512x448 DR WIN 3 = 640x480 DS FULL");
#ifndef __OPENGL__ #ifndef __OPENGL__
@@ -178,7 +178,7 @@ static void display_help()
put_line(" File Formats Supported by GUI : SMC,SFC,SWC,FIG,MGD,UFO,BIN,"); put_line(" File Formats Supported by GUI : SMC,SFC,SWC,FIG,MGD,UFO,BIN,");
put_line(" 058,078,1,USA,EUR,JAP,ZIP,JMA"); put_line(" 058,078,1,USA,EUR,JAP,ZIP,JMA");
put_line(""); put_line("");
#ifndef __LINUX__ #ifndef __UNIXSDL__
put_line(" Microsoft-style options (/option) are also accepted"); put_line(" Microsoft-style options (/option) are also accepted");
#endif #endif
/* /*
@@ -270,7 +270,7 @@ static void handle_params(int argc, char *argv[])
for (i = 1; i < argc; i++) for (i = 1; i < argc; i++)
{ {
#ifndef __LINUX__ #ifndef __UNIXSDL__
if (argv[i][0] == '-' || argv[i][0] == '/') if (argv[i][0] == '-' || argv[i][0] == '/')
#else #else
if (argv[i][0] == '-') if (argv[i][0] == '-')
@@ -587,7 +587,7 @@ int main(int zargc, char *zargv[])
argc = zargc; argc = zargc;
argv = zargv; argv = zargv;
#ifdef __LINUX__ #ifdef __UNIXSDL__
handle_params(zargc, zargv); handle_params(zargc, zargv);
#endif #endif

2
zsnes/src/zmovie.c
View File

@@ -20,7 +20,7 @@ along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/ */
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "gblhdr.h" #include "gblhdr.h"
#define DIR_SLASH "/" #define DIR_SLASH "/"
#else #else

6
zsnes/src/zstate.c
View File

@@ -22,7 +22,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
#ifdef __LINUX__ #ifdef __UNIXSDL__
#include "gblhdr.h" #include "gblhdr.h"
#define DIR_SLASH "/" #define DIR_SLASH "/"
#else #else
@@ -603,7 +603,7 @@ void statesaver()
//Save State code //Save State code
#ifdef __LINUX__ #ifdef __UNIXSDL__
SRAMChdir(); SRAMChdir();
#endif #endif
@@ -864,7 +864,7 @@ void stateloader (unsigned char *statename, unsigned char keycheck, unsigned cha
INSERT_POSITION_NUMBER(txtrrldmsg, txtrrldnum); INSERT_POSITION_NUMBER(txtrrldmsg, txtrrldnum);
#ifdef __LINUX__ #ifdef __UNIXSDL__
SRAMChdir(); SRAMChdir();
#endif #endif