Mercurial > sdl-ios-xcode
view src/video/pandora/SDL_pandora.h @ 4426:1bceff8f008f
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.)
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.
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.
video/SDL_blit.h (and configure.in) (SDL-1.3-only) : MinGW-w64
uses msvcrt version of _aligned_malloc and _aligned_free and
they are defined in intrin.h (similar to VC). Adding proper
ifdefs fixes it. (Notes about macros to check: __MINGW32__ is
defined for both mingw.org and for mingw-w64 for both win32 and
win64, __MINGW64__ is only defined for _WIN64, so __MINGW64__
can't be used to detect mingw-w64: including _mingw.h and then
checking for __MINGW64_VERSION_MAJOR does the trick.)
SDL_win32video.h (SDL-1.3-only) : Tweaked the VINWER definition
and location in order to avoid multiple redefinition warnings.
Hope these are useful. Thanks.
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 10 Mar 2010 15:02:58 +0000 |
parents | f7b03b6838cb |
children | 11cedc036ca1 |
line wrap: on
line source
/* SDL - Simple DirectMedia Layer Copyright (C) 1997-2010 Sam Lantinga This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA Sam Lantinga slouken@libsdl.org Open Pandora SDL driver Copyright (C) 2009 David Carré (cpasjuste@gmail.com) */ #ifndef __SDL_PANDORA_H__ #define __SDL_PANDORA_H__ #include <GLES/egl.h> #include "SDL_config.h" #include "../SDL_sysvideo.h" typedef struct SDL_VideoData { SDL_bool egl_initialized; /* OpenGL ES device initialization status */ EGLDisplay egl_display; /* OpenGL ES display connection */ uint32_t egl_refcount; /* OpenGL ES reference count */ uint32_t swapinterval; /* OpenGL ES default swap interval */ } SDL_VideoData; typedef struct SDL_DisplayData { } SDL_DisplayData; typedef struct SDL_WindowData { SDL_bool uses_gles; /* if true window must support OpenGL ES */ EGLConfig gles_configs[32]; EGLint gles_config; /* OpenGL ES configuration index */ EGLContext gles_context; /* OpenGL ES context */ EGLint gles_attributes[256]; /* OpenGL ES attributes for context */ EGLSurface gles_surface; /* OpenGL ES target rendering surface */ } SDL_WindowData; /****************************************************************************/ /* SDL_VideoDevice functions declaration */ /****************************************************************************/ /* Display and window functions */ int PND_videoinit(_THIS); void PND_videoquit(_THIS); void PND_getdisplaymodes(_THIS); int PND_setdisplaymode(_THIS, SDL_DisplayMode * mode); int PND_setdisplaypalette(_THIS, SDL_Palette * palette); int PND_getdisplaypalette(_THIS, SDL_Palette * palette); int PND_setdisplaygammaramp(_THIS, Uint16 * ramp); int PND_getdisplaygammaramp(_THIS, Uint16 * ramp); int PND_createwindow(_THIS, SDL_Window * window); int PND_createwindowfrom(_THIS, SDL_Window * window, const void *data); void PND_setwindowtitle(_THIS, SDL_Window * window); void PND_setwindowicon(_THIS, SDL_Window * window, SDL_Surface * icon); void PND_setwindowposition(_THIS, SDL_Window * window); void PND_setwindowsize(_THIS, SDL_Window * window); void PND_showwindow(_THIS, SDL_Window * window); void PND_hidewindow(_THIS, SDL_Window * window); void PND_raisewindow(_THIS, SDL_Window * window); void PND_maximizewindow(_THIS, SDL_Window * window); void PND_minimizewindow(_THIS, SDL_Window * window); void PND_restorewindow(_THIS, SDL_Window * window); void PND_setwindowgrab(_THIS, SDL_Window * window); void PND_destroywindow(_THIS, SDL_Window * window); /* Window manager function */ SDL_bool PND_getwindowwminfo(_THIS, SDL_Window * window, struct SDL_SysWMinfo *info); /* OpenGL/OpenGL ES functions */ int PND_gl_loadlibrary(_THIS, const char *path); void *PND_gl_getprocaddres(_THIS, const char *proc); void PND_gl_unloadlibrary(_THIS); SDL_GLContext PND_gl_createcontext(_THIS, SDL_Window * window); int PND_gl_makecurrent(_THIS, SDL_Window * window, SDL_GLContext context); int PND_gl_setswapinterval(_THIS, int interval); int PND_gl_getswapinterval(_THIS); void PND_gl_swapwindow(_THIS, SDL_Window * window); void PND_gl_deletecontext(_THIS, SDL_GLContext context); #endif /* __SDL_PANDORA_H__ */ /* vi: set ts=4 sw=4 expandtab: */