Leahnaya/SDL
1
0
Fork 0
mirror of https://github.com/yawut/SDL.git synced 2026-09-14 03:56:39 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed bug #925

Browse Source 
Changed "win32" to "windows"
This commit is contained in:
Sam Lantinga
2011-01-20 18:04:05 -08:00
parent aebcea297d
commit 08ad787807
82 changed files with 382 additions and 375 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/SDL_compat.h
View File

@@ -64,6 +64,12 @@ extern "C" {
*/
/*@{*/
/* Platform */
#ifdef __WINDOWS__
#undef __WIN32__
#define __WIN32__ 1
#endif
/**
* \name Surface flags
*/

4
include/SDL_config.h.default
View File

@@ -40,8 +40,8 @@
#include "SDL_config_iphoneos.h"
#elif defined(__MACOSX__)
#include "SDL_config_macosx.h"
#elif defined(__WIN32__)
#include "SDL_config_win32.h"
#elif defined(__WINDOWS__)
#include "SDL_config_windows.h"
#else
#include "SDL_config_minimal.h"
#endif /* platform config */

10
include/SDL_config.h.in
View File

@@ -89,7 +89,7 @@
#undef HAVE_REALLOC
#undef HAVE_FREE
#undef HAVE_ALLOCA
#ifndef _WIN32 /* Don't use C runtime versions of these on Windows */
#ifndef __WINDOWS__ /* Don't use C runtime versions of these on Windows */
#undef HAVE_GETENV
#undef HAVE_SETENV
#undef HAVE_PUTENV
@@ -235,7 +235,7 @@
#undef SDL_LOADSO_DLOPEN
#undef SDL_LOADSO_DUMMY
#undef SDL_LOADSO_LDG
#undef SDL_LOADSO_WIN32
#undef SDL_LOADSO_WINDOWS
/* Enable various threading systems */
#undef SDL_THREAD_BEOS
@@ -244,7 +244,7 @@
#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX
#undef SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP
#undef SDL_THREAD_SPROC
#undef SDL_THREAD_WIN32
#undef SDL_THREAD_WINDOWS
/* Enable various timer systems */
#undef SDL_TIMER_BEOS
@@ -252,7 +252,7 @@
#undef SDL_TIMER_NDS
#undef SDL_TIMER_RISCOS
#undef SDL_TIMER_UNIX
#undef SDL_TIMER_WIN32
#undef SDL_TIMER_WINDOWS
#undef SDL_TIMER_WINCE
/* Enable various video drivers */
@@ -265,7 +265,7 @@
#undef SDL_VIDEO_DRIVER_PHOTON
#undef SDL_VIDEO_DRIVER_QNXGF
#undef SDL_VIDEO_DRIVER_RISCOS
#undef SDL_VIDEO_DRIVER_WIN32
#undef SDL_VIDEO_DRIVER_WINDOWS
#undef SDL_VIDEO_DRIVER_X11
#undef SDL_VIDEO_DRIVER_X11_DYNAMIC
#undef SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT

14
include/SDL_config_win32.h → include/SDL_config_windows.h
View File

@@ -20,8 +20,8 @@
slouken@libsdl.org
*/
#ifndef _SDL_config_win32_h
#define _SDL_config_win32_h
#ifndef _SDL_config_windows2_h
#define _SDL_config_windows2_h
#include "SDL_platform.h"
@@ -162,21 +162,21 @@ typedef unsigned int uintptr_t;
#endif
/* Enable various shared object loading systems */
#define SDL_LOADSO_WIN32 1
#define SDL_LOADSO_WINDOWS 1
/* Enable various threading systems */
#define SDL_THREAD_WIN32 1
#define SDL_THREAD_WINDOWS 1
/* Enable various timer systems */
#ifdef _WIN32_WCE
#define SDL_TIMER_WINCE 1
#else
#define SDL_TIMER_WIN32 1
#define SDL_TIMER_WINDOWS 1
#endif
/* Enable various video drivers */
#define SDL_VIDEO_DRIVER_DUMMY 1
#define SDL_VIDEO_DRIVER_WIN32 1
#define SDL_VIDEO_DRIVER_WINDOWS 1
#define SDL_VIDEO_RENDER_D3D 1
#define SDL_VIDEO_RENDER_GDI 1
@@ -196,4 +196,4 @@ typedef unsigned int uintptr_t;
#define SDL_ASSEMBLY_ROUTINES 1
#endif
#endif /* _SDL_config_win32_h */
#endif /* _SDL_config_windows2_h */

4
include/SDL_main.h
View File

@@ -31,7 +31,7 @@
* Redefine main() on some platforms so that it is called by SDL.
*/
#if defined(__WIN32__) || \
#if defined(__WINDOWS__) || \
(defined(__MWERKS__) && !defined(__BEOS__)) || \
defined(__SYMBIAN32__) || defined(__IPHONEOS__) || \
defined(__ANDROID__)
@@ -66,7 +66,7 @@ extern C_LINKAGE int SDL_main(int argc, char *argv[]);
/* From the SDL library code -- needed for registering the app on Win32 */
#ifdef __WIN32__
#ifdef __WINDOWS__
#include "begin_code.h"
#ifdef __cplusplus

2
include/SDL_opengl.h
View File

@@ -31,7 +31,7 @@
#include "SDL_config.h"
#ifdef __WIN32__
#ifdef __WINDOWS__
#define WIN32_LEAN_AND_MEAN
#ifndef NOMINMAX
#define NOMINMAX /* Don't defined min() and max() */

4
include/SDL_platform.h
View File

@@ -125,8 +125,8 @@
#define __SOLARIS__ 1
#endif
#if defined(WIN32) || defined(_WIN32)
#undef __WIN32__
#define __WIN32__ 1
#undef __WINDOWS__
#define __WINDOWS__ 1
#endif
#if defined(__NDS__)

4
include/SDL_rwops.h
View File

@@ -83,7 +83,7 @@ typedef struct SDL_RWops
Uint32 type;
union
{
#ifdef __WIN32__
#ifdef __WINDOWS__
struct
{
SDL_bool append;
@@ -94,7 +94,7 @@ typedef struct SDL_RWops
size_t size;
size_t left;
} buffer;
} win32io;
} windowsio;
#endif
#ifdef HAVE_STDIO_H
struct

6
include/SDL_syswm.h
View File

@@ -54,7 +54,7 @@ extern "C" {
struct SDL_SysWMinfo;
#else
#if defined(SDL_VIDEO_DRIVER_WIN32)
#if defined(SDL_VIDEO_DRIVER_WINDOWS)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#endif
@@ -118,7 +118,7 @@ struct SDL_SysWMmsg
SDL_SYSWM_TYPE subsystem;
union
{
#if defined(SDL_VIDEO_DRIVER_WIN32)
#if defined(SDL_VIDEO_DRIVER_WINDOWS)
struct {
HWND hwnd; /**< The window for the message */
UINT msg; /**< The type of message */
@@ -163,7 +163,7 @@ struct SDL_SysWMinfo
SDL_SYSWM_TYPE subsystem;
union
{
#if defined(SDL_VIDEO_DRIVER_WIN32)
#if defined(SDL_VIDEO_DRIVER_WINDOWS)
struct
{
HWND window; /**< The window handle */

2
include/SDL_thread.h
View File

@@ -55,7 +55,7 @@ typedef unsigned long SDL_threadID;
*/
typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
#if defined(__WIN32__) && !defined(HAVE_LIBC)
#if defined(__WINDOWS__) && !defined(HAVE_LIBC)
/**
* \file SDL_thread.h
*

4
include/begin_code.h
View File

@@ -42,7 +42,7 @@
# else
# define DECLSPEC __declspec(export)
# endif
# elif defined(__WIN32__)
# elif defined(__WINDOWS__)
# ifdef __BORLANDC__
# ifdef BUILD_SDL
# define DECLSPEC
@@ -63,7 +63,7 @@
/* By default SDL uses the C calling convention */
#ifndef SDLCALL
#if defined(__WIN32__) && !defined(__GNUC__)
#if defined(__WINDOWS__) && !defined(__GNUC__)
#define SDLCALL __cdecl
#else
#define SDLCALL