Some Mac OS X fixes.
Joystick was more stubborn than it should have been.
This commit is contained in:
@@ -262,7 +262,7 @@ int JoystickDevice::AssignIDs( InputDevice startID )
|
|||||||
|
|
||||||
void JoystickDevice::GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevices ) const
|
void JoystickDevice::GetDevicesAndDescriptions( vector<InputDeviceInfo>& vDevices ) const
|
||||||
{
|
{
|
||||||
for (Joystick &i : m_vSticks)
|
for (auto &i : m_vSticks)
|
||||||
vDevices.push_back( InputDeviceInfo(i.id,GetDescription()) );
|
vDevices.push_back( InputDeviceInfo(i.id,GetDescription()) );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -43,16 +43,7 @@ extern "C" int SM_main( int argc, char *argv[] );
|
|||||||
#define ArchSwap16(n) OSSwapInt16((n))
|
#define ArchSwap16(n) OSSwapInt16((n))
|
||||||
#define HAVE_BYTE_SWAPS
|
#define HAVE_BYTE_SWAPS
|
||||||
|
|
||||||
// Define the work around if needed.
|
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
#include <stdint.h>
|
|
||||||
#if _GLIBCXX_USE_C99
|
|
||||||
# define NEED_CSTDLIB_WORKAROUND
|
|
||||||
#else
|
|
||||||
inline int64_t llabs( int64_t x ) { return x < 0LL ? -x : x; }
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define attribute_deprecated // Shut ffmpeg up!
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user