diff options
author | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-05-07 20:13:42 +0000 |
---|---|---|
committer | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2002-05-07 20:13:42 +0000 |
commit | 60a246062494032fcc6e2d74ea5c863a57342aec (patch) | |
tree | 0cf73b7b097d26aa60f5e4941f5c9e7ec64b21ab /emulators/zsnes | |
parent | The JAD homepage seems to have disappeared a long time (diff) |
Unbreak zsnes with the latest SDL update: disable joystick code for now
PR: 37830
Submitted by: maintainer
Notes
Notes:
svn path=/head/; revision=58675
Diffstat (limited to 'emulators/zsnes')
-rw-r--r-- | emulators/zsnes/files/patch-src::linux::sdllink.c | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/emulators/zsnes/files/patch-src::linux::sdllink.c b/emulators/zsnes/files/patch-src::linux::sdllink.c new file mode 100644 index 000000000000..88641e2af231 --- /dev/null +++ b/emulators/zsnes/files/patch-src::linux::sdllink.c @@ -0,0 +1,35 @@ +--- linux/sdllink.c.orig Sun Sep 23 17:42:52 2001 ++++ linux/sdllink.c Tue May 7 13:16:21 2002 +@@ -536,6 +536,11 @@ + + for (i = 0; i < 5; i++) + JoystickInput[i] = NULL; ++#if 1 ++ printf("ZSNES could not find any joysticks.\n"); ++ SDL_QuitSubSystem(SDL_INIT_JOYSTICK); ++ return FALSE; ++#else + // If it is possible to use SDL_NumJoysticks + // before initialising SDL_INIT_JOYSTICK then + // this call can be replaced with SDL_InitSubSystem +@@ -557,6 +562,7 @@ + } + + return TRUE; ++#endif + } + + BOOL InitInput() +@@ -572,7 +578,11 @@ + if (!sdl_inited) + { + if (SDL_Init(SDL_INIT_AUDIO | SDL_INIT_TIMER | +- SDL_INIT_VIDEO | SDL_INIT_JOYSTICK) < 0) ++ SDL_INIT_VIDEO ++#if 0 ++| SDL_INIT_JOYSTICK ++#endif ++ ) < 0) + { + fprintf(stderr, "Could not initialize SDL!\n"); + return FALSE; |