blob: 6eb87d2e9c8f45d7d74238c1a2eab159c32dfb72 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
--- src/joystick.c.orig Tue Dec 5 02:11:08 2000
+++ src/joystick.c Tue Jan 30 09:52:41 2001
@@ -11,10 +11,6 @@
* joystick.c *
***********************************************************/
-#if defined(PLATFORM_FREEBSD)
-#include <machine/joystick.h>
-#endif
-
#include "libgame/libgame.h"
#include "joystick.h"
@@ -319,7 +315,7 @@
#if defined(PLATFORM_UNIX)
int Joystick(int player_nr)
{
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && !defined(NO_JOYSTICK)
struct joystick joy_ctrl;
#else
struct joystick_control
@@ -355,7 +351,7 @@
js_x = joy_ctrl.x;
js_y = joy_ctrl.y;
-#ifdef __FreeBSD__
+#if defined(__FreeBSD__) && !defined(NO_JOYSTICK)
js_b1 = joy_ctrl.b1;
js_b2 = joy_ctrl.b2;
#else
|
