~ubuntu-branches/ubuntu/maverick/vice/maverick

« back to all changes in this revision

Viewing changes to src/arch/unix/uijoystick2.c

  • Committer: Bazaar Package Importer
  • Author(s): Zed Pobre
  • Date: 2005-02-01 11:30:26 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20050201113026-3eyakzsmmheclvjg
Tags: 1.16-1
* New upstream version
* Fixes crash on 64-bit architectures (closes: #287640)
* x128 working again (closes: #286767)
* Works fine with /dev/dsp in use (not in the main changelog, but tested
  on my local machine as working).  Presumably, this also takes care of
  the issue with dsp being held.  I'm not sure if this is because I'm
  testing it on a 2.6 kernel now -- if you are still having problems
  with /dev/dsp, please reopen the bugs. (closes: #152952, #207942)
* Don't kill Makefile.in on clean

Show diffs side-by-side

added added

removed removed

Lines of Context:
99
99
      (ui_callback_t)set_joystick_device_1,
100
100
      (ui_callback_data_t)JOYDEV_DIGITAL_1, NULL },
101
101
#endif
 
102
#ifdef HAS_USB_JOYSTICK
 
103
    { N_("*USB Joystick 0"),
 
104
      (ui_callback_t)set_joystick_device_1,
 
105
      (ui_callback_data_t)JOYDEV_USB_0, NULL },
 
106
    { N_("*USB Joystick 1"),
 
107
      (ui_callback_t)set_joystick_device_1,
 
108
      (ui_callback_data_t)JOYDEV_USB_1, NULL },
 
109
#endif
102
110
#endif
103
111
    { NULL }
104
112
};
128
136
      (ui_callback_t)set_joystick_device_2,
129
137
      (ui_callback_data_t)JOYDEV_DIGITAL_1, NULL },
130
138
#endif
 
139
#ifdef HAS_USB_JOYSTICK
 
140
    { N_("*USB Joystick 0"),
 
141
      (ui_callback_t)set_joystick_device_2,
 
142
      (ui_callback_data_t)JOYDEV_USB_0, NULL },
 
143
    { N_("*USB Joystick 1"),
 
144
      (ui_callback_t)set_joystick_device_2,
 
145
      (ui_callback_data_t)JOYDEV_USB_1, NULL },
 
146
#endif
131
147
#endif /* HAS_JOYSTICK */
132
148
    { NULL }
133
149
};