sdl-ios-xcode: src/video/riscos/SDL

annotate src/video/riscos/SDL_riscosvideo.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

rev	line source
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
3697 f7b03b6838cb Fixed bug #926 Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	3 Copyright (C) 1997-2010 Sam Lantinga
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	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
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	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.
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	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.
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	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
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
1312 c9b51268668f Updated copyright information and removed rcs id lines (problematic in branch merges) Sam Lantinga <slouken@libsdl.org> parents: 769 diff changeset	20 slouken@libsdl.org
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
1402 d910939febfa Use consistent identifiers for the various platforms we support. Sam Lantinga <slouken@libsdl.org> parents: 1361 diff changeset	22 #include "SDL_config.h"
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 #ifndef _SDL_riscosvideo_h
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	25 #define _SDL_riscosvideo_h
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	27 #include "SDL_mouse.h"
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28 #include "SDL_mutex.h"
1361 19418e4422cb New configure-based build system. Still work in progress, but much improved Sam Lantinga <slouken@libsdl.org> parents: 1312 diff changeset	29 #include "../SDL_sysvideo.h"
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31 /* Hidden "this" pointer for the video functions */
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32 #define _THIS SDL_VideoDevice *this
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35 /* Private display data */
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	36
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	37 struct SDL_PrivateVideoData
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	38 {
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39 unsigned char *bank[2];
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 int current_bank;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	41 unsigned char *alloc_bank;
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42 int height;
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	43 int xeig;
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44 int yeig;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	45 int screen_bpp;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	46 int screen_width;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	47 int screen_height;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	48 char *pixtrans;
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	49
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	50 /* Wimp variables */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	51 unsigned int window_handle;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	52 char title[256];
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	53
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	54 #define NUM_MODELISTS 4 /* 8, 16, 24, and 32 bits-per-pixel */
630 550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 int SDL_nummodes[NUM_MODELISTS];
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	56 SDL_Rect **SDL_modelist[NUM_MODELISTS];
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	57 };
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	59 /* Old variable names */
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60 #define SDL_nummodes (this->hidden->SDL_nummodes)
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61 #define SDL_modelist (this->hidden->SDL_modelist)
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62
550bccdf04bd Added initial support for RISC OS (thanks Peter Naulls!) Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63 #endif /* _SDL_risosvideo_h */
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: 1402 diff changeset	64 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/riscos/SDL_riscosvideo.h @ 4426:1bceff8f008f