Mercurial > sdl-ios-xcode
annotate include/SDL_config_symbian.h @ 4427:eada7e321df6 SDL-1.2
Fixed bug #943
Ozkan Sezer 2010-02-06 12:31:06 PST
Hi:
Here are some small fixes for compiling SDL against mingw-w64.
(see http://mingw-w64.sourceforge.net/ . Despite the name, it
supports both win32 and win64.) Two patches, one for SDL-1.2
and one for SDL-1.3 attached.
src/audio/windx5/directx.h and src/video/windx5/directx.h (both
SDL-1.2 and SDL-1.3.) I get compilation errors about some union
not having a member named u1 and alike, because of other system
headers being included before this one and them already defining
DUMMYUNIONNAME and stuff. This header probably assumes that those
stuff are defined in windef.h, but mingw-w64 headers define them
in _mingw.h. Easily fixed by moving NONAMELESSUNION definition to
the top of the file. SDL_dx5yuv.c (SDL-1.2-only) also needs to
include the header before SDL_video.h to avoid the same problem.
src/thread/win32/SDL_systhread.c (both SDL-1.2 and SDL-1.3.) :
The __GNUC__ case for pfnSDL_CurrentBeginThread is 32-bit centric
because _beginthreadex returns uintptr_t, not unsigned long which
is 32 bits in win64. Changing the return type to uintptr_t fixes
it.
Hope these are useful. Thanks.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Wed, 10 Mar 2010 15:04:13 +0000 |
| parents | a1b03ba2fcd0 |
| children |
| rev | line source |
|---|---|
| 3975 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 3975 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
| 6 modify it under the terms of the GNU Lesser General Public | |
| 7 License as published by the Free Software Foundation; either | |
| 8 version 2.1 of the License, or (at your option) any later version. | |
| 9 | |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 13 Lesser General Public License for more details. | |
| 14 | |
| 15 You should have received a copy of the GNU Lesser General Public | |
| 16 License along with this library; if not, write to the Free Software | |
| 17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA | |
| 18 | |
| 19 Sam Lantinga | |
| 20 slouken@libsdl.org | |
| 21 */ | |
| 22 | |
| 23 /* | |
| 24 | |
| 25 Symbian version Markus Mertama | |
| 26 | |
| 27 */ | |
| 28 | |
| 29 | |
| 30 #ifndef _SDL_CONFIG_SYMBIAN_H | |
| 31 #define _SDL_CONFIG_SYMBIAN_H | |
| 32 | |
| 33 #include "SDL_platform.h" | |
| 34 | |
| 35 /* This is the minimal configuration that can be used to build SDL */ | |
| 36 | |
| 37 | |
| 38 #include <stdarg.h> | |
| 39 #include <stddef.h> | |
| 40 | |
| 41 | |
| 42 #ifdef __GCCE__ | |
| 43 #define SYMBIAN32_GCCE | |
| 44 #endif | |
| 45 | |
| 46 #ifndef _SIZE_T_DEFINED | |
| 47 typedef unsigned int size_t; | |
| 48 #endif | |
| 49 | |
| 50 #ifndef _INTPTR_T_DECLARED | |
| 51 typedef unsigned int uintptr_t; | |
| 52 #endif | |
| 53 | |
| 54 #ifndef _INT8_T_DECLARED | |
| 55 typedef signed char int8_t; | |
| 56 #endif | |
| 57 | |
| 58 #ifndef _UINT8_T_DECLARED | |
| 59 typedef unsigned char uint8_t; | |
| 60 #endif | |
| 61 | |
| 62 #ifndef _INT16_T_DECLARED | |
| 63 typedef signed short int16_t; | |
| 64 #endif | |
| 65 | |
| 66 #ifndef _UINT16_T_DECLARED | |
| 67 typedef unsigned short uint16_t; | |
| 68 #endif | |
| 69 | |
| 70 #ifndef _INT32_T_DECLARED | |
| 71 typedef signed int int32_t; | |
| 72 #endif | |
| 73 | |
| 74 #ifndef _UINT32_T_DECLARED | |
| 75 typedef unsigned int uint32_t; | |
| 76 #endif | |
| 77 | |
| 78 #ifndef _INT64_T_DECLARED | |
| 79 typedef signed long long int64_t; | |
| 80 #endif | |
| 81 | |
| 82 #ifndef _UINT64_T_DECLARED | |
| 83 typedef unsigned long long uint64_t; | |
| 84 #endif | |
| 85 | |
| 86 #define SDL_AUDIO_DRIVER_EPOCAUDIO 1 | |
| 87 | |
| 88 | |
| 89 /* Enable the stub cdrom driver (src/cdrom/dummy/\*.c) */ | |
| 90 #define SDL_CDROM_DISABLED 1 | |
| 91 | |
| 92 /* Enable the stub joystick driver (src/joystick/dummy/\*.c) */ | |
| 93 #define SDL_JOYSTICK_DISABLED 1 | |
| 94 | |
| 95 /* Enable the stub shared object loader (src/loadso/dummy/\*.c) */ | |
| 96 #define SDL_LOADSO_DISABLED 1 | |
| 97 | |
| 98 #define SDL_THREAD_SYMBIAN 1 | |
| 99 | |
| 100 #define SDL_VIDEO_DRIVER_EPOC 1 | |
| 101 | |
| 102 #define SDL_VIDEO_OPENGL 0 | |
| 103 | |
| 104 #define SDL_HAS_64BIT_TYPE 1 | |
| 105 | |
| 106 #define HAVE_LIBC 1 | |
| 107 #define HAVE_STDIO_H 1 | |
| 108 #define STDC_HEADERS 1 | |
| 109 #define HAVE_STRING_H 1 | |
| 110 #define HAVE_CTYPE_H 1 | |
| 111 #define HAVE_MATH_H 1 | |
| 112 | |
| 113 #define HAVE_MALLOC 1 | |
| 114 #define HAVE_CALLOC 1 | |
| 115 #define HAVE_REALLOC 1 | |
| 116 #define HAVE_FREE 1 | |
|
4097
c5169b89787f
Removed stray C++ comment
Sam Lantinga <slouken@libsdl.org>
parents:
4004
diff
changeset
|
117 /*#define HAVE_ALLOCA 1*/ |
| 3975 | 118 #define HAVE_QSORT 1 |
| 119 #define HAVE_ABS 1 | |
| 120 #define HAVE_MEMSET 1 | |
| 121 #define HAVE_MEMCPY 1 | |
| 122 #define HAVE_MEMMOVE 1 | |
| 123 #define HAVE_MEMCMP 1 | |
| 124 #define HAVE_STRLEN 1 | |
| 125 #define HAVE__STRUPR 1 | |
| 126 #define HAVE_STRCHR 1 | |
| 127 #define HAVE_STRRCHR 1 | |
| 128 #define HAVE_STRSTR 1 | |
| 129 #define HAVE_ITOA 1 | |
| 130 #define HAVE_STRTOL 1 | |
| 131 #define HAVE_STRTOUL 1 | |
| 132 #define HAVE_STRTOLL 1 | |
| 133 #define HAVE_STRTOD 1 | |
| 134 #define HAVE_ATOI 1 | |
| 135 #define HAVE_ATOF 1 | |
| 136 #define HAVE_STRCMP 1 | |
| 137 #define HAVE_STRNCMP 1 | |
|
4097
c5169b89787f
Removed stray C++ comment
Sam Lantinga <slouken@libsdl.org>
parents:
4004
diff
changeset
|
138 /*#define HAVE__STRICMP 1*/ |
| 3975 | 139 #define HAVE__STRNICMP 1 |
| 140 #define HAVE_SSCANF 1 | |
| 141 #define HAVE_STDARG_H 1 | |
| 142 #define HAVE_STDDEF_H 1 | |
| 143 | |
| 144 | |
| 145 | |
| 146 #endif /* _SDL_CONFIG_SYMBIAN_H */ |