[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15849] trunk/lib/windows/sdl: updated to version 1.2.13.
Robert Holcomb
bob_holcomb at hotmail.com
Mon Jul 28 21:11:44 CEST 2008
Revision: 15849
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15849
Author: scourage
Date: 2008-07-28 21:11:43 +0200 (Mon, 28 Jul 2008)
Log Message:
-----------
updated to version 1.2.13. Buggy audio in original version (1.2.5)
Modified Paths:
--------------
trunk/lib/windows/sdl/include/SDL.h
trunk/lib/windows/sdl/include/SDL_active.h
trunk/lib/windows/sdl/include/SDL_audio.h
trunk/lib/windows/sdl/include/SDL_byteorder.h
trunk/lib/windows/sdl/include/SDL_cdrom.h
trunk/lib/windows/sdl/include/SDL_copying.h
trunk/lib/windows/sdl/include/SDL_endian.h
trunk/lib/windows/sdl/include/SDL_error.h
trunk/lib/windows/sdl/include/SDL_events.h
trunk/lib/windows/sdl/include/SDL_getenv.h
trunk/lib/windows/sdl/include/SDL_joystick.h
trunk/lib/windows/sdl/include/SDL_keyboard.h
trunk/lib/windows/sdl/include/SDL_keysym.h
trunk/lib/windows/sdl/include/SDL_main.h
trunk/lib/windows/sdl/include/SDL_mouse.h
trunk/lib/windows/sdl/include/SDL_mutex.h
trunk/lib/windows/sdl/include/SDL_opengl.h
trunk/lib/windows/sdl/include/SDL_quit.h
trunk/lib/windows/sdl/include/SDL_rwops.h
trunk/lib/windows/sdl/include/SDL_syswm.h
trunk/lib/windows/sdl/include/SDL_thread.h
trunk/lib/windows/sdl/include/SDL_timer.h
trunk/lib/windows/sdl/include/SDL_types.h
trunk/lib/windows/sdl/include/SDL_version.h
trunk/lib/windows/sdl/include/SDL_video.h
trunk/lib/windows/sdl/include/begin_code.h
trunk/lib/windows/sdl/include/close_code.h
trunk/lib/windows/sdl/lib/SDL.dll
trunk/lib/windows/sdl/lib/SDL.lib
Added Paths:
-----------
trunk/lib/windows/sdl/include/SDL_config.h
trunk/lib/windows/sdl/include/SDL_config.h.default
trunk/lib/windows/sdl/include/SDL_config.h.in
trunk/lib/windows/sdl/include/SDL_config_dreamcast.h
trunk/lib/windows/sdl/include/SDL_config_macos.h
trunk/lib/windows/sdl/include/SDL_config_macosx.h
trunk/lib/windows/sdl/include/SDL_config_minimal.h
trunk/lib/windows/sdl/include/SDL_config_nds.h
trunk/lib/windows/sdl/include/SDL_config_os2.h
trunk/lib/windows/sdl/include/SDL_config_symbian.h
trunk/lib/windows/sdl/include/SDL_config_win32.h
trunk/lib/windows/sdl/include/SDL_cpuinfo.h
trunk/lib/windows/sdl/include/SDL_loadso.h
trunk/lib/windows/sdl/include/SDL_platform.h
trunk/lib/windows/sdl/include/SDL_stdinc.h
Modified: trunk/lib/windows/sdl/include/SDL.h
===================================================================
--- trunk/lib/windows/sdl/include/SDL.h 2008-07-28 16:55:48 UTC (rev 15848)
+++ trunk/lib/windows/sdl/include/SDL.h 2008-07-28 19:11:43 UTC (rev 15849)
@@ -1,47 +1,44 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+ Copyright (C) 1997-2006 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
+ modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 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 at libsdl.org
*/
-#ifdef SAVE_RCSID
-static char rcsid =
- "@(#) $Id$";
-#endif
-
/* Main include header for the SDL library */
#ifndef _SDL_H
#define _SDL_H
#include "SDL_main.h"
-#include "SDL_types.h"
-#include "SDL_getenv.h"
-#include "SDL_error.h"
-#include "SDL_rwops.h"
-#include "SDL_timer.h"
+#include "SDL_stdinc.h"
#include "SDL_audio.h"
#include "SDL_cdrom.h"
-#include "SDL_joystick.h"
+#include "SDL_cpuinfo.h"
+#include "SDL_endian.h"
+#include "SDL_error.h"
#include "SDL_events.h"
+#include "SDL_loadso.h"
+#include "SDL_mutex.h"
+#include "SDL_rwops.h"
+#include "SDL_thread.h"
+#include "SDL_timer.h"
#include "SDL_video.h"
-#include "SDL_byteorder.h"
#include "SDL_version.h"
#include "begin_code.h"
Modified: trunk/lib/windows/sdl/include/SDL_active.h
===================================================================
--- trunk/lib/windows/sdl/include/SDL_active.h 2008-07-28 16:55:48 UTC (rev 15848)
+++ trunk/lib/windows/sdl/include/SDL_active.h 2008-07-28 19:11:43 UTC (rev 15849)
@@ -1,35 +1,33 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+ Copyright (C) 1997-2006 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
+ modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 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 at libsdl.org
*/
-#ifdef SAVE_RCSID
-static char rcsid =
- "@(#) $Id$";
-#endif
-
/* Include file for SDL application focus event handling */
#ifndef _SDL_active_h
#define _SDL_active_h
+#include "SDL_stdinc.h"
+#include "SDL_error.h"
+
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
#ifdef __cplusplus
Modified: trunk/lib/windows/sdl/include/SDL_audio.h
===================================================================
--- trunk/lib/windows/sdl/include/SDL_audio.h 2008-07-28 16:55:48 UTC (rev 15848)
+++ trunk/lib/windows/sdl/include/SDL_audio.h 2008-07-28 19:11:43 UTC (rev 15849)
@@ -1,42 +1,36 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+ Copyright (C) 1997-2006 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
+ modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 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 at libsdl.org
*/
-#ifdef SAVE_RCSID
-static char rcsid =
- "@(#) $Id$";
-#endif
-
/* Access to the raw audio mixing buffer for the SDL library */
#ifndef _SDL_audio_h
#define _SDL_audio_h
-#include <stdio.h>
-
-#include "SDL_main.h"
-#include "SDL_types.h"
+#include "SDL_stdinc.h"
#include "SDL_error.h"
+#include "SDL_endian.h"
+#include "SDL_mutex.h"
+#include "SDL_thread.h"
#include "SDL_rwops.h"
-#include "SDL_byteorder.h"
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
@@ -45,7 +39,7 @@
#endif
/* The calculated values in this structure are calculated by SDL_OpenAudio() */
-typedef struct {
+typedef struct SDL_AudioSpec {
int freq; /* DSP frequency -- samples per second */
Uint16 format; /* Audio data format */
Uint8 channels; /* Number of channels: 1 mono, 2 stereo */
@@ -59,7 +53,7 @@
Once the callback returns, the buffer will no longer be valid.
Stereo samples are stored in a LRLRLR ordering.
*/
- void (*callback)(void *userdata, Uint8 *stream, int len);
+ void (SDLCALL *callback)(void *userdata, Uint8 *stream, int len);
void *userdata;
} SDL_AudioSpec;
@@ -94,7 +88,7 @@
int len_cvt; /* Length of converted audio buffer */
int len_mult; /* buffer must be len*len_mult big */
double len_ratio; /* Given len, final size is len*len_ratio */
- void (*filters[10])(struct SDL_AudioCVT *cvt, Uint16 format);
+ void (SDLCALL *filters[10])(struct SDL_AudioCVT *cvt, Uint16 format);
int filter_index; /* Current audio conversion function */
} SDL_AudioCVT;
Modified: trunk/lib/windows/sdl/include/SDL_byteorder.h
===================================================================
--- trunk/lib/windows/sdl/include/SDL_byteorder.h 2008-07-28 16:55:48 UTC (rev 15848)
+++ trunk/lib/windows/sdl/include/SDL_byteorder.h 2008-07-28 19:11:43 UTC (rev 15849)
@@ -1,53 +1,24 @@
/*
SDL - Simple DirectMedia Layer
- Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002 Sam Lantinga
+ Copyright (C) 1997-2006 Sam Lantinga
This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
+ modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
+ 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
- Library General Public License for more details.
+ Lesser General Public License for more details.
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the Free
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ 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 at libsdl.org
*/
-#ifdef SAVE_RCSID
-static char rcsid =
- "@(#) $Id$";
-#endif
-
-/* Macros for determining the byte-order of this platform */
-
-#ifndef _SDL_byteorder_h
-#define _SDL_byteorder_h
-
-/* The two types of endianness */
-#define SDL_LIL_ENDIAN 1234
-#define SDL_BIG_ENDIAN 4321
-
-/* Pardon the mess, I'm trying to determine the endianness of this host.
- I'm doing it by preprocessor defines rather than some sort of configure
- script so that application code can use this too. The "right" way would
- be to dynamically generate this file on install, but that's a lot of work.
- */
-#if defined(__i386__) || defined(__ia64__) || defined(WIN32) || \
- (defined(__alpha__) || defined(__alpha)) || \
- defined(__arm__) || \
- (defined(__mips__) && defined(__MIPSEL__)) || \
- defined(__SYMBIAN32__) || \
- defined(__LITTLE_ENDIAN__)
-#define SDL_BYTEORDER SDL_LIL_ENDIAN
-#else
-#define SDL_BYTEORDER SDL_BIG_ENDIAN
-#endif
-
-#endif /* _SDL_byteorder_h */
+/* DEPRECATED */
+#include "SDL_endian.h"
Modified: trunk/lib/windows/sdl/include/SDL_cdrom.h
===================================================================
--- trunk/lib/windows/sdl/include/SDL_cdrom.h 2008-07-28 16:55:48 UTC (rev 15848)
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list