Update SDL2 to 2.0.2

This commit is contained in:
MAN-AT-ARMS 2014-03-08 22:00:38 -05:00 committed by Zack Middleton
parent 9ec7931c54
commit dafed0fd66
93 changed files with 7247 additions and 609 deletions

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
@ -32,10 +32,6 @@
#undef __AIX__
#define __AIX__ 1
#endif
#if defined(__BEOS__)
#undef __BEOS__
#define __BEOS__ 1
#endif
#if defined(__HAIKU__)
#undef __HAIKU__
#define __HAIKU__ 1
@ -64,9 +60,9 @@
#undef __LINUX__
#define __LINUX__ 1
#endif
#if defined(ANDROID)
#if defined(ANDROID) || defined(__ANDROID__)
#undef __ANDROID__
#undef __LINUX__ /*do we need to do this?*/
#undef __LINUX__ /* do we need to do this? */
#define __ANDROID__ 1
#endif
@ -118,8 +114,12 @@
#define __SOLARIS__ 1
#endif
#if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__)
#undef __WINDOWS__
#define __WINDOWS__ 1
#endif
#if defined(__WINDOWS__)
#undef __WIN32__
#define __WIN32__ 1
#define __WIN32__ 1
#endif
#if defined(__PSP__)
#undef __PSP__