[quake3-commits] r2240 - trunk/code/SDL12/include
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Apr 10 02:44:04 EDT 2012
Author: zakk
Date: 2012-04-10 02:44:04 -0400 (Tue, 10 Apr 2012)
New Revision: 2240
Modified:
trunk/code/SDL12/include/SDL.h
trunk/code/SDL12/include/SDL_active.h
trunk/code/SDL12/include/SDL_audio.h
trunk/code/SDL12/include/SDL_byteorder.h
trunk/code/SDL12/include/SDL_cdrom.h
trunk/code/SDL12/include/SDL_config_dreamcast.h
trunk/code/SDL12/include/SDL_config_macos.h
trunk/code/SDL12/include/SDL_config_macosx.h
trunk/code/SDL12/include/SDL_config_minimal.h
trunk/code/SDL12/include/SDL_config_nds.h
trunk/code/SDL12/include/SDL_config_os2.h
trunk/code/SDL12/include/SDL_config_symbian.h
trunk/code/SDL12/include/SDL_config_win32.h
trunk/code/SDL12/include/SDL_copying.h
trunk/code/SDL12/include/SDL_cpuinfo.h
trunk/code/SDL12/include/SDL_endian.h
trunk/code/SDL12/include/SDL_error.h
trunk/code/SDL12/include/SDL_events.h
trunk/code/SDL12/include/SDL_getenv.h
trunk/code/SDL12/include/SDL_joystick.h
trunk/code/SDL12/include/SDL_keyboard.h
trunk/code/SDL12/include/SDL_keysym.h
trunk/code/SDL12/include/SDL_loadso.h
trunk/code/SDL12/include/SDL_main.h
trunk/code/SDL12/include/SDL_mouse.h
trunk/code/SDL12/include/SDL_mutex.h
trunk/code/SDL12/include/SDL_opengl.h
trunk/code/SDL12/include/SDL_platform.h
trunk/code/SDL12/include/SDL_quit.h
trunk/code/SDL12/include/SDL_rwops.h
trunk/code/SDL12/include/SDL_stdinc.h
trunk/code/SDL12/include/SDL_syswm.h
trunk/code/SDL12/include/SDL_thread.h
trunk/code/SDL12/include/SDL_timer.h
trunk/code/SDL12/include/SDL_types.h
trunk/code/SDL12/include/SDL_version.h
trunk/code/SDL12/include/SDL_video.h
trunk/code/SDL12/include/begin_code.h
trunk/code/SDL12/include/close_code.h
Log:
updating SDL includes to 1.2.15
Listen to this if this doesn't work out properly:
http://timedoctor.org/fun/swf/starwars/tauntaun-soundboard.swf
Modified: trunk/code/SDL12/include/SDL.h
===================================================================
--- trunk/code/SDL12/include/SDL.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_active.h
===================================================================
--- trunk/code/SDL12/include/SDL_active.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_active.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_audio.h
===================================================================
--- trunk/code/SDL12/include/SDL_audio.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_audio.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_byteorder.h
===================================================================
--- trunk/code/SDL12/include/SDL_byteorder.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_byteorder.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_cdrom.h
===================================================================
--- trunk/code/SDL12/include/SDL_cdrom.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_cdrom.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_config_dreamcast.h
===================================================================
--- trunk/code/SDL12/include/SDL_config_dreamcast.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_config_dreamcast.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_config_macos.h
===================================================================
--- trunk/code/SDL12/include/SDL_config_macos.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_config_macos.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_config_macosx.h
===================================================================
--- trunk/code/SDL12/include/SDL_config_macosx.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_config_macosx.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_config_minimal.h
===================================================================
--- trunk/code/SDL12/include/SDL_config_minimal.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_config_minimal.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_config_nds.h
===================================================================
--- trunk/code/SDL12/include/SDL_config_nds.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_config_nds.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_config_os2.h
===================================================================
--- trunk/code/SDL12/include/SDL_config_os2.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_config_os2.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_config_symbian.h
===================================================================
--- trunk/code/SDL12/include/SDL_config_symbian.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_config_symbian.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_config_win32.h
===================================================================
--- trunk/code/SDL12/include/SDL_config_win32.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_config_win32.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_copying.h
===================================================================
--- trunk/code/SDL12/include/SDL_copying.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_copying.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_cpuinfo.h
===================================================================
--- trunk/code/SDL12/include/SDL_cpuinfo.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_cpuinfo.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_endian.h
===================================================================
--- trunk/code/SDL12/include/SDL_endian.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_endian.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -39,6 +39,10 @@
/*@}*/
#ifndef SDL_BYTEORDER /* Not defined in SDL_config.h? */
+#ifdef __linux__
+#include <endian.h>
+#define SDL_BYTEORDER __BYTE_ORDER
+#else /* __linux __ */
#if defined(__hppa__) || \
defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
(defined(__MIPS__) && defined(__MISPEB__)) || \
@@ -48,6 +52,7 @@
#else
#define SDL_BYTEORDER SDL_LIL_ENDIAN
#endif
+#endif /* __linux __ */
#endif /* !SDL_BYTEORDER */
@@ -81,12 +86,12 @@
#elif defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))
static __inline__ Uint16 SDL_Swap16(Uint16 x)
{
- Uint16 result;
+ int result;
__asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
- return result;
+ return (Uint16)result;
}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
+#elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__))
static __inline__ Uint16 SDL_Swap16(Uint16 x)
{
__asm__("rorw #8,%0" : "=d" (x) : "0" (x) : "cc");
@@ -94,7 +99,7 @@
}
#else
static __inline__ Uint16 SDL_Swap16(Uint16 x) {
- return((x<<8)|(x>>8));
+ return SDL_static_cast(Uint16, ((x<<8)|(x>>8)));
}
#endif
@@ -121,7 +126,7 @@
__asm__("rlwimi %0,%2,24,0,7" : "=&r" (result) : "0" (result), "r" (x));
return result;
}
-#elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
+#elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__))
static __inline__ Uint32 SDL_Swap32(Uint32 x)
{
__asm__("rorw #8,%0\n\tswap %0\n\trorw #8,%0" : "=d" (x) : "0" (x) : "cc");
@@ -129,7 +134,7 @@
}
#else
static __inline__ Uint32 SDL_Swap32(Uint32 x) {
- return((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24));
+ return SDL_static_cast(Uint32, ((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24)));
}
#endif
@@ -166,7 +171,7 @@
x = SDL_Swap32(lo);
x <<= 32;
x |= SDL_Swap32(hi);
- return(x);
+ return (x);
}
#endif
#else
Modified: trunk/code/SDL12/include/SDL_error.h
===================================================================
--- trunk/code/SDL12/include/SDL_error.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_error.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_events.h
===================================================================
--- trunk/code/SDL12/include/SDL_events.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_events.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_getenv.h
===================================================================
--- trunk/code/SDL12/include/SDL_getenv.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_getenv.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_joystick.h
===================================================================
--- trunk/code/SDL12/include/SDL_joystick.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_joystick.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_keyboard.h
===================================================================
--- trunk/code/SDL12/include/SDL_keyboard.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_keyboard.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_keysym.h
===================================================================
--- trunk/code/SDL12/include/SDL_keysym.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_keysym.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_loadso.h
===================================================================
--- trunk/code/SDL12/include/SDL_loadso.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_loadso.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_main.h
===================================================================
--- trunk/code/SDL12/include/SDL_main.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_main.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_mouse.h
===================================================================
--- trunk/code/SDL12/include/SDL_mouse.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_mouse.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_mutex.h
===================================================================
--- trunk/code/SDL12/include/SDL_mutex.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_mutex.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_opengl.h
===================================================================
--- trunk/code/SDL12/include/SDL_opengl.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_opengl.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -3108,21 +3108,35 @@
#ifndef GL_VERSION_1_5
/* GL types for handling large vertex buffer objects */
+#ifdef __APPLE__
+typedef long GLintptr;
+typedef long GLsizeiptr;
+#else
typedef ptrdiff_t GLintptr;
typedef ptrdiff_t GLsizeiptr;
#endif
+#endif
#ifndef GL_ARB_vertex_buffer_object
/* GL types for handling large vertex buffer objects */
+#ifdef __APPLE__
+typedef long GLintptrARB;
+typedef long GLsizeiptrARB;
+#else
typedef ptrdiff_t GLintptrARB;
typedef ptrdiff_t GLsizeiptrARB;
#endif
+#endif
#ifndef GL_ARB_shader_objects
/* GL types for handling shader object handles and program/shader text */
typedef char GLcharARB; /* native character */
+#if defined(__APPLE__)
+typedef void *GLhandleARB; /* shader object handle */
+#else
typedef unsigned int GLhandleARB; /* shader object handle */
#endif
+#endif
/* GL types for "half" precision (s10e5) float data in host memory */
#ifndef GL_ARB_half_float_pixel
Modified: trunk/code/SDL12/include/SDL_platform.h
===================================================================
--- trunk/code/SDL12/include/SDL_platform.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_platform.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_quit.h
===================================================================
--- trunk/code/SDL12/include/SDL_quit.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_quit.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_rwops.h
===================================================================
--- trunk/code/SDL12/include/SDL_rwops.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_rwops.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_stdinc.h
===================================================================
--- trunk/code/SDL12/include/SDL_stdinc.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_stdinc.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_syswm.h
===================================================================
--- trunk/code/SDL12/include/SDL_syswm.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_syswm.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -203,12 +203,13 @@
/**
* This function gives you custom hooks into the window manager information.
* It fills the structure pointed to by 'info' with custom information and
- * returns 1 if the function is implemented. If it's not implemented, or
- * the version member of the 'info' structure is invalid, it returns 0.
+ * returns 0 if the function is not implemented, 1 if the function is
+ * implemented and no error occurred, and -1 if the version member of
+ * the 'info' structure is not filled in or not supported.
*
* You typically use this function like this:
* @code
- * SDL_SysWMInfo info;
+ * SDL_SysWMinfo info;
* SDL_VERSION(&info.version);
* if ( SDL_GetWMInfo(&info) ) { ... }
* @endcode
Modified: trunk/code/SDL12/include/SDL_thread.h
===================================================================
--- trunk/code/SDL12/include/SDL_thread.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_thread.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -68,11 +68,6 @@
#ifdef __OS2__
typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void *arg);
typedef void (*pfnSDL_CurrentEndThread)(void);
-#elif __GNUC__
-typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
- unsigned (__stdcall *func)(void *), void *arg,
- unsigned, unsigned *threadID);
-typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
#else
typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
unsigned (__stdcall *func)(void *), void *arg,
Modified: trunk/code/SDL12/include/SDL_timer.h
===================================================================
--- trunk/code/SDL12/include/SDL_timer.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_timer.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_types.h
===================================================================
--- trunk/code/SDL12/include/SDL_types.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_types.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/SDL_version.h
===================================================================
--- trunk/code/SDL12/include/SDL_version.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_version.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -41,7 +41,7 @@
/*@{*/
#define SDL_MAJOR_VERSION 1
#define SDL_MINOR_VERSION 2
-#define SDL_PATCHLEVEL 14
+#define SDL_PATCHLEVEL 15
/*@}*/
typedef struct SDL_version {
Modified: trunk/code/SDL12/include/SDL_video.h
===================================================================
--- trunk/code/SDL12/include/SDL_video.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/SDL_video.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
Modified: trunk/code/SDL12/include/begin_code.h
===================================================================
--- trunk/code/SDL12/include/begin_code.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/begin_code.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
@@ -43,7 +43,7 @@
#ifndef DECLSPEC
# if defined(__BEOS__) || defined(__HAIKU__)
# if defined(__GNUC__)
-# define DECLSPEC __declspec(dllexport)
+# define DECLSPEC
# else
# define DECLSPEC __declspec(export)
# endif
@@ -132,7 +132,12 @@
#ifdef __BORLANDC__
#pragma nopackwarning
#endif
+#ifdef _M_X64
+/* Use 8-byte alignment on 64-bit architectures, so pointers are aligned */
+#pragma pack(push,8)
+#else
#pragma pack(push,4)
+#endif
#elif (defined(__MWERKS__) && defined(__MACOS__))
#pragma options align=mac68k4byte
#pragma enumsalwaysint on
Modified: trunk/code/SDL12/include/close_code.h
===================================================================
--- trunk/code/SDL12/include/close_code.h 2012-04-10 06:01:16 UTC (rev 2239)
+++ trunk/code/SDL12/include/close_code.h 2012-04-10 06:44:04 UTC (rev 2240)
@@ -1,6 +1,6 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2009 Sam Lantinga
+ Copyright (C) 1997-2012 Sam Lantinga
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
More information about the quake3-commits
mailing list