Mercurial > sdl-ios-xcode
annotate src/video/SDL_cursor_c.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 |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 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 | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
769
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
0
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
| 24 /* Useful variables and functions from SDL_cursor.c */ | |
| 25 #include "SDL_mouse.h" | |
| 26 | |
| 27 extern int SDL_CursorInit(Uint32 flags); | |
| 28 extern void SDL_CursorPaletteChanged(void); | |
| 29 extern void SDL_DrawCursor(SDL_Surface *screen); | |
| 30 extern void SDL_DrawCursorNoLock(SDL_Surface *screen); | |
| 31 extern void SDL_EraseCursor(SDL_Surface *screen); | |
| 32 extern void SDL_EraseCursorNoLock(SDL_Surface *screen); | |
| 33 extern void SDL_UpdateCursor(SDL_Surface *screen); | |
| 34 extern void SDL_ResetCursor(void); | |
| 35 extern void SDL_MoveCursor(int x, int y); | |
| 36 extern void SDL_CursorQuit(void); | |
| 37 | |
| 38 #define INLINE_MOUSELOCK | |
| 39 #ifdef INLINE_MOUSELOCK | |
| 40 /* Inline (macro) versions of the mouse lock functions */ | |
| 41 #include "SDL_mutex.h" | |
| 42 | |
| 43 extern SDL_mutex *SDL_cursorlock; | |
| 44 | |
| 45 #define SDL_LockCursor() \ | |
| 46 do { \ | |
| 47 if ( SDL_cursorlock ) { \ | |
| 48 SDL_mutexP(SDL_cursorlock); \ | |
| 49 } \ | |
| 50 } while ( 0 ) | |
| 51 #define SDL_UnlockCursor() \ | |
| 52 do { \ | |
| 53 if ( SDL_cursorlock ) { \ | |
| 54 SDL_mutexV(SDL_cursorlock); \ | |
| 55 } \ | |
| 56 } while ( 0 ) | |
| 57 #else | |
| 58 extern void SDL_LockCursor(void); | |
| 59 extern void SDL_UnlockCursor(void); | |
| 60 #endif /* INLINE_MOUSELOCK */ | |
| 61 | |
| 62 /* Only for low-level mouse cursor drawing */ | |
| 63 extern SDL_Cursor *SDL_cursor; | |
| 64 extern void SDL_MouseRect(SDL_Rect *area); | |
| 65 | |
| 66 /* State definitions for the SDL cursor */ | |
| 67 #define CURSOR_VISIBLE 0x01 | |
| 68 #define CURSOR_USINGSW 0x10 | |
| 69 #define SHOULD_DRAWCURSOR(X) \ | |
| 70 (((X)&(CURSOR_VISIBLE|CURSOR_USINGSW)) == \ | |
| 71 (CURSOR_VISIBLE|CURSOR_USINGSW)) | |
| 72 | |
| 73 extern volatile int SDL_cursorstate; |