Merge branch releases/1.8 revisions 4923:4997 into trunk:
- Fix compiling on Free BSD (thanks to leper for reporting and patch) git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@4998 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
ed321197a7
commit
cb81239938
|
@ -82,6 +82,7 @@ Changes in 1.9 (not yet released)
|
|||
--------------------------
|
||||
Changes in 1.8.2
|
||||
|
||||
- Fix compiling on Free BSD (thanks to leper for reporting and patch)
|
||||
- Fix bug with multiple SetPixelFormat calls. (reported and fixed by anontypist)
|
||||
- Fix bug related to memory release in PNG image loader. Thanks elephoenix for it.
|
||||
- Fix crash in CGUIListBox when users pressed end key folled by any other key in an empty, focused list box (thanks at porcus for report and patch).
|
||||
|
|
|
@ -33,7 +33,7 @@
|
|||
#include <fcntl.h>
|
||||
#include <unistd.h>
|
||||
|
||||
#ifdef __FREE_BSD_
|
||||
#ifdef __FreeBSD__
|
||||
#include <sys/joystick.h>
|
||||
#else
|
||||
|
||||
|
@ -1898,7 +1898,7 @@ bool CIrrDeviceLinux::activateJoysticks(core::array<SJoystickInfo> & joystickInf
|
|||
if (-1 == info.fd)
|
||||
continue;
|
||||
|
||||
#ifdef __FREE_BSD_
|
||||
#ifdef __FreeBSD__
|
||||
info.axes=2;
|
||||
info.buttons=2;
|
||||
#else
|
||||
|
@ -1922,7 +1922,7 @@ bool CIrrDeviceLinux::activateJoysticks(core::array<SJoystickInfo> & joystickInf
|
|||
returnInfo.Axes = info.axes;
|
||||
returnInfo.Buttons = info.buttons;
|
||||
|
||||
#ifndef __FREE_BSD_
|
||||
#ifndef __FreeBSD__
|
||||
char name[80];
|
||||
ioctl( info.fd, JSIOCGNAME(80), name);
|
||||
returnInfo.Name = name;
|
||||
|
@ -1957,7 +1957,7 @@ void CIrrDeviceLinux::pollJoysticks()
|
|||
{
|
||||
JoystickInfo & info = ActiveJoysticks[j];
|
||||
|
||||
#ifdef __FREE_BSD_
|
||||
#ifdef __FreeBSD__
|
||||
struct joystick js;
|
||||
if (read(info.fd, &js, JS_RETURN) == JS_RETURN)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue