Update SDL2 to 2.0.2

This commit is contained in:
MAN-AT-ARMS authored and Zack Middleton committed 2014-03-08 21:33:02 -06:00
1 parent 9ec7931c54
commit dafed0fd66
93 files changed
+7246 -608

No files matched your search

+8 -8
View File
@@ -1,6 +1,6 @@
/*
Simple DirectMedia Layer
Copyright (C) 1997-2013 Sam Lantinga <slouken@libsdl.org>
Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
@@ -140,12 +140,12 @@ typedef struct _SDL_Haptic SDL_Haptic;
*
* Different haptic features a device can have.
*/
/*@{*/
/* @{ */
/**
* \name Haptic effects
*/
/*@{*/
/* @{ */
/**
* \brief Constant effect supported.
@@ -177,7 +177,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
#define SDL_HAPTIC_LEFTRIGHT (1<<2)
/* !!! FIXME: put this back when we have more bits in 2.1 */
/*#define SDL_HAPTIC_SQUARE (1<<2)*/
/* #define SDL_HAPTIC_SQUARE (1<<2) */
/**
* \brief Triangle wave effect supported.
@@ -262,7 +262,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
*/
#define SDL_HAPTIC_CUSTOM (1<<11)
/*@}*//*Haptic effects*/
/* @} *//* Haptic effects */
/* These last few are features the device has, not effects */
@@ -305,7 +305,7 @@ typedef struct _SDL_Haptic SDL_Haptic;
/**
* \name Direction encodings
*/
/*@{*/
/* @{ */
/**
* \brief Uses polar coordinates for the direction.
@@ -328,9 +328,9 @@ typedef struct _SDL_Haptic SDL_Haptic;
*/
#define SDL_HAPTIC_SPHERICAL 2
/*@}*//*Direction encodings*/
/* @} *//* Direction encodings */
/*@}*//*Haptic features*/
/* @} *//* Haptic features */
/*
* Misc defines.