Skip to content

Commit

Permalink
Update to SDL dev 10642:8a420b80310a
Browse files Browse the repository at this point in the history
  • Loading branch information
jgranick committed Nov 23, 2016
1 parent fa8fd53 commit bdfd417
Show file tree
Hide file tree
Showing 224 changed files with 3,635 additions and 18,690 deletions.
2 changes: 2 additions & 0 deletions files.xml
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,8 @@

<section if="LIBSDL_WAYLAND">

<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/wayland/SDL_waylandclipboard.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/wayland/SDL_waylanddatamanager.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/wayland/SDL_waylanddyn.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/wayland/SDL_waylandevents.c" />
<file name="${NATIVE_TOOLKIT_PATH}/sdl/src/video/wayland/SDL_waylandmouse.c" />
Expand Down
6 changes: 3 additions & 3 deletions include/SDL.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
*/


#ifndef _SDL_H
#define _SDL_H
#ifndef SDL_h_
#define SDL_h_

#include "SDL_main.h"
#include "SDL_stdinc.h"
Expand Down Expand Up @@ -127,6 +127,6 @@ extern DECLSPEC void SDLCALL SDL_Quit(void);
#endif
#include "close_code.h"

#endif /* _SDL_H */
#endif /* SDL_h_ */

/* vi: set ts=4 sw=4 expandtab: */
10 changes: 5 additions & 5 deletions include/SDL_assert.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/

#ifndef _SDL_assert_h
#define _SDL_assert_h
#ifndef SDL_assert_h_
#define SDL_assert_h_

#include "SDL_config.h"

Expand Down Expand Up @@ -201,7 +201,7 @@ typedef SDL_AssertState (SDLCALL *SDL_AssertionHandler)(
*
* This callback is NOT reset to SDL's internal handler upon SDL_Quit()!
*
* \return SDL_AssertState value of how to handle the assertion failure.
* Return SDL_AssertState value of how to handle the assertion failure.
*
* \param handler Callback function, called when an assertion fails.
* \param userdata A pointer passed to the callback as-is.
Expand Down Expand Up @@ -250,7 +250,7 @@ extern DECLSPEC SDL_AssertionHandler SDLCALL SDL_GetAssertionHandler(void **puse
* <code>
* const SDL_AssertData *item = SDL_GetAssertionReport();
* while (item) {
* printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\n",
* printf("'%s', %s (%s:%d), triggered %u times, always ignore: %s.\\n",
* item->condition, item->function, item->filename,
* item->linenum, item->trigger_count,
* item->always_ignore ? "yes" : "no");
Expand Down Expand Up @@ -284,6 +284,6 @@ extern DECLSPEC void SDLCALL SDL_ResetAssertionReport(void);
#endif
#include "close_code.h"

#endif /* _SDL_assert_h */
#endif /* SDL_assert_h_ */

/* vi: set ts=4 sw=4 expandtab: */
6 changes: 3 additions & 3 deletions include/SDL_atomic.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
* All of the atomic operations that modify memory are full memory barriers.
*/

#ifndef _SDL_atomic_h_
#define _SDL_atomic_h_
#ifndef SDL_atomic_h_
#define SDL_atomic_h_

#include "SDL_stdinc.h"
#include "SDL_platform.h"
Expand Down Expand Up @@ -263,6 +263,6 @@ extern DECLSPEC void* SDLCALL SDL_AtomicGetPtr(void **a);

#include "close_code.h"

#endif /* _SDL_atomic_h_ */
#endif /* SDL_atomic_h_ */

/* vi: set ts=4 sw=4 expandtab: */
6 changes: 3 additions & 3 deletions include/SDL_audio.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
* Access to the raw audio mixing buffer for the SDL library.
*/

#ifndef _SDL_audio_h
#define _SDL_audio_h
#ifndef SDL_audio_h_
#define SDL_audio_h_

#include "SDL_stdinc.h"
#include "SDL_error.h"
Expand Down Expand Up @@ -667,6 +667,6 @@ extern DECLSPEC void SDLCALL SDL_CloseAudioDevice(SDL_AudioDeviceID dev);
#endif
#include "close_code.h"

#endif /* _SDL_audio_h */
#endif /* SDL_audio_h_ */

/* vi: set ts=4 sw=4 expandtab: */
6 changes: 3 additions & 3 deletions include/SDL_bits.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
* Functions for fiddling with bits and bitmasks.
*/

#ifndef _SDL_bits_h
#define _SDL_bits_h
#ifndef SDL_bits_h_
#define SDL_bits_h_

#include "SDL_stdinc.h"

Expand Down Expand Up @@ -92,6 +92,6 @@ SDL_MostSignificantBitIndex32(Uint32 x)
#endif
#include "close_code.h"

#endif /* _SDL_bits_h */
#endif /* SDL_bits_h_ */

/* vi: set ts=4 sw=4 expandtab: */
6 changes: 3 additions & 3 deletions include/SDL_blendmode.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
* Header file declaring the SDL_BlendMode enumeration
*/

#ifndef _SDL_blendmode_h
#define _SDL_blendmode_h
#ifndef SDL_blendmode_h_
#define SDL_blendmode_h_

#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
Expand Down Expand Up @@ -58,6 +58,6 @@ typedef enum
#endif
#include "close_code.h"

#endif /* _SDL_blendmode_h */
#endif /* SDL_blendmode_h_ */

/* vi: set ts=4 sw=4 expandtab: */
6 changes: 3 additions & 3 deletions include/SDL_clipboard.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
* Include file for SDL clipboard handling
*/

#ifndef _SDL_clipboard_h
#define _SDL_clipboard_h
#ifndef SDL_clipboard_h_
#define SDL_clipboard_h_

#include "SDL_stdinc.h"

Expand Down Expand Up @@ -66,6 +66,6 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasClipboardText(void);
#endif
#include "close_code.h"

#endif /* _SDL_clipboard_h */
#endif /* SDL_clipboard_h_ */

/* vi: set ts=4 sw=4 expandtab: */
6 changes: 3 additions & 3 deletions include/SDL_config_android.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/

#ifndef _SDL_config_android_h
#define _SDL_config_android_h
#ifndef SDL_config_android_h_
#define SDL_config_android_h_

#include "SDL_platform.h"

Expand Down Expand Up @@ -145,4 +145,4 @@
/* Enable the filesystem driver */
#define SDL_FILESYSTEM_ANDROID 1

#endif /* _SDL_config_android_h */
#endif /* SDL_config_android_h_ */
6 changes: 3 additions & 3 deletions include/SDL_config_iphoneos.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/

#ifndef _SDL_config_iphoneos_h
#define _SDL_config_iphoneos_h
#ifndef SDL_config_iphoneos_h_
#define SDL_config_iphoneos_h_

#include "SDL_platform.h"

Expand Down Expand Up @@ -155,4 +155,4 @@
/* enable filesystem support */
#define SDL_FILESYSTEM_COCOA 1

#endif /* _SDL_config_iphoneos_h */
#endif /* SDL_config_iphoneos_h_ */
6 changes: 3 additions & 3 deletions include/SDL_config_macosx.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/

#ifndef _SDL_config_macosx_h
#define _SDL_config_macosx_h
#ifndef SDL_config_macosx_h_
#define SDL_config_macosx_h_

#include "SDL_platform.h"

Expand Down Expand Up @@ -185,4 +185,4 @@
#define SDL_ALTIVEC_BLITTERS 1
#endif

#endif /* _SDL_config_macosx_h */
#endif /* SDL_config_macosx_h_ */
6 changes: 3 additions & 3 deletions include/SDL_config_minimal.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/

#ifndef _SDL_config_minimal_h
#define _SDL_config_minimal_h
#ifndef SDL_config_minimal_h_
#define SDL_config_minimal_h_

#include "SDL_platform.h"

Expand Down Expand Up @@ -78,4 +78,4 @@ typedef unsigned long uintptr_t;
/* Enable the dummy filesystem driver (src/filesystem/dummy/\*.c) */
#define SDL_FILESYSTEM_DUMMY 1

#endif /* _SDL_config_minimal_h */
#endif /* SDL_config_minimal_h_ */
6 changes: 3 additions & 3 deletions include/SDL_config_pandora.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/

#ifndef _SDL_config_h
#define _SDL_config_h
#ifndef SDL_config_h_
#define SDL_config_h_

/* This is a set of defines to configure the SDL features */

Expand Down Expand Up @@ -124,4 +124,4 @@
#define SDL_VIDEO_RENDER_OGL_ES 1
#define SDL_VIDEO_OPENGL_ES 1

#endif /* _SDL_config_h */
#endif /* SDL_config_h_ */
6 changes: 3 additions & 3 deletions include/SDL_config_psp.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/

#ifndef _SDL_config_psp_h
#define _SDL_config_psp_h
#ifndef SDL_config_psp_h_
#define SDL_config_psp_h_

#include "SDL_platform.h"

Expand Down Expand Up @@ -140,4 +140,4 @@
#define SDL_LOADSO_DISABLED 1


#endif /* _SDL_config_psp_h */
#endif /* SDL_config_psp_h_ */
6 changes: 3 additions & 3 deletions include/SDL_config_windows.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/

#ifndef _SDL_config_windows_h
#define _SDL_config_windows_h
#ifndef SDL_config_windows_h_
#define SDL_config_windows_h_

#include "SDL_platform.h"

Expand Down Expand Up @@ -218,4 +218,4 @@ typedef unsigned int uintptr_t;
#define SDL_ASSEMBLY_ROUTINES 1
#endif

#endif /* _SDL_config_windows_h */
#endif /* SDL_config_windows_h_ */
6 changes: 3 additions & 3 deletions include/SDL_config_winrt.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/

#ifndef _SDL_config_winrt_h
#define _SDL_config_winrt_h
#ifndef SDL_config_winrt_h_
#define SDL_config_winrt_h_

#include "SDL_platform.h"

Expand Down Expand Up @@ -211,4 +211,4 @@ typedef unsigned int uintptr_t;
#define SDL_ASSEMBLY_ROUTINES 1
#endif

#endif /* _SDL_config_winrt_h */
#endif /* SDL_config_winrt_h_ */
6 changes: 3 additions & 3 deletions include/SDL_config_wiz.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
3. This notice may not be removed or altered from any source distribution.
*/

#ifndef _SDL_config_h
#define _SDL_config_h
#ifndef SDL_config_h_
#define SDL_config_h_

/* This is a set of defines to configure the SDL features */

Expand Down Expand Up @@ -117,4 +117,4 @@
#define SDL_VIDEO_RENDER_OGL_ES 1
#define SDL_VIDEO_OPENGL_ES 1

#endif /* _SDL_config_h */
#endif /* SDL_config_h_ */
11 changes: 8 additions & 3 deletions include/SDL_cpuinfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
* CPU feature detection for SDL.
*/

#ifndef _SDL_cpuinfo_h
#define _SDL_cpuinfo_h
#ifndef SDL_cpuinfo_h_
#define SDL_cpuinfo_h_

#include "SDL_stdinc.h"

Expand Down Expand Up @@ -144,6 +144,11 @@ extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX(void);
*/
extern DECLSPEC SDL_bool SDLCALL SDL_HasAVX2(void);

/**
* This function returns true if the CPU has NEON (ARM SIMD) features.
*/
extern DECLSPEC SDL_bool SDLCALL SDL_HasNEON(void);

/**
* This function returns the amount of RAM configured in the system, in MB.
*/
Expand All @@ -156,6 +161,6 @@ extern DECLSPEC int SDLCALL SDL_GetSystemRAM(void);
#endif
#include "close_code.h"

#endif /* _SDL_cpuinfo_h */
#endif /* SDL_cpuinfo_h_ */

/* vi: set ts=4 sw=4 expandtab: */
6 changes: 3 additions & 3 deletions include/SDL_endian.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
* Functions for reading and writing endian-specific values
*/

#ifndef _SDL_endian_h
#define _SDL_endian_h
#ifndef SDL_endian_h_
#define SDL_endian_h_

#include "SDL_stdinc.h"

Expand Down Expand Up @@ -234,6 +234,6 @@ SDL_SwapFloat(float x)
#endif
#include "close_code.h"

#endif /* _SDL_endian_h */
#endif /* SDL_endian_h_ */

/* vi: set ts=4 sw=4 expandtab: */
6 changes: 3 additions & 3 deletions include/SDL_error.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
* Simple error message routines for SDL.
*/

#ifndef _SDL_error_h
#define _SDL_error_h
#ifndef SDL_error_h_
#define SDL_error_h_

#include "SDL_stdinc.h"

Expand Down Expand Up @@ -71,6 +71,6 @@ extern DECLSPEC int SDLCALL SDL_Error(SDL_errorcode code);
#endif
#include "close_code.h"

#endif /* _SDL_error_h */
#endif /* SDL_error_h_ */

/* vi: set ts=4 sw=4 expandtab: */
Loading

0 comments on commit bdfd417

Please sign in to comment.