Mercurial > sdl-ios-xcode
changeset 3762:f667489e7309 gsoc2008_manymouse
sync with trunk
| author | Szymon Wilczek <kazeuser@gmail.com> |
|---|---|
| date | Wed, 02 Jul 2008 20:20:51 +0000 |
| parents | e0c95ad1ba87 |
| children | 81ea7d9a6624 |
| files | include/SDL_main.h include/SDL_platform.h include/SDL_stdinc.h |
| diffstat | 3 files changed, 12 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/include/SDL_main.h Thu Jun 19 17:24:30 2008 +0000 +++ b/include/SDL_main.h Wed Jul 02 20:20:51 2008 +0000 @@ -29,7 +29,7 @@ #if defined(__WIN32__) || \ (defined(__MWERKS__) && !defined(__BEOS__)) || \ - defined(__SYMBIAN32__) + defined(__SYMBIAN32__) || defined(__IPHONEOS__) #ifdef __cplusplus #define C_LINKAGE "C"
--- a/include/SDL_platform.h Thu Jun 19 17:24:30 2008 +0000 +++ b/include/SDL_platform.h Wed Jul 02 20:20:51 2008 +0000 @@ -57,13 +57,19 @@ #undef __LINUX__ #define __LINUX__ 1 #endif + #if defined(__APPLE__) +#include "targetconditionals.h" +#if TARGET_OS_IPHONE +#undef __IPHONEOS__ +#define __IPHONEOS__ 1 +#undef __MACOSX__ +#else #undef __MACOSX__ #define __MACOSX__ 1 -#elif defined(macintosh) -#undef __MACOS__ -#define __MACOS__ 1 +#endif #endif + #if defined(__NetBSD__) #undef __NETBSD__ #define __NETBSD__ 1
--- a/include/SDL_stdinc.h Thu Jun 19 17:24:30 2008 +0000 +++ b/include/SDL_stdinc.h Wed Jul 02 20:20:51 2008 +0000 @@ -147,8 +147,8 @@ SDL_COMPILE_TIME_ASSERT(sint16, sizeof(Sint16) == 2); SDL_COMPILE_TIME_ASSERT(uint32, sizeof(Uint32) == 4); SDL_COMPILE_TIME_ASSERT(sint32, sizeof(Sint32) == 4); -SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8); -SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); +//SDL_COMPILE_TIME_ASSERT(uint64, sizeof(Uint64) == 8); +//SDL_COMPILE_TIME_ASSERT(sint64, sizeof(Sint64) == 8); #endif /* DOXYGEN_SHOULD_IGNORE_THIS */ /* Check to make sure enums are the size of ints, for structure packing.