[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61436] trunk/lib/win64_vc12/sdl: Bump win64 vc2013 to SDL2
Martijn Berger
martijn.berger at gmail.com
Thu Nov 13 16:20:41 CET 2014
Revision: 61436
https://developer.blender.org/rBL61436
Author: juicyfruit
Date: 2014-11-13 15:20:40 +0000 (Thu, 13 Nov 2014)
Log Message:
-----------
Bump win64 vc2013 to SDL2
Modified Paths:
--------------
trunk/lib/win64_vc12/sdl/include/SDL.h
trunk/lib/win64_vc12/sdl/include/SDL_audio.h
trunk/lib/win64_vc12/sdl/include/SDL_config.h
trunk/lib/win64_vc12/sdl/include/SDL_cpuinfo.h
trunk/lib/win64_vc12/sdl/include/SDL_endian.h
trunk/lib/win64_vc12/sdl/include/SDL_error.h
trunk/lib/win64_vc12/sdl/include/SDL_events.h
trunk/lib/win64_vc12/sdl/include/SDL_joystick.h
trunk/lib/win64_vc12/sdl/include/SDL_keyboard.h
trunk/lib/win64_vc12/sdl/include/SDL_loadso.h
trunk/lib/win64_vc12/sdl/include/SDL_main.h
trunk/lib/win64_vc12/sdl/include/SDL_mouse.h
trunk/lib/win64_vc12/sdl/include/SDL_mutex.h
trunk/lib/win64_vc12/sdl/include/SDL_name.h
trunk/lib/win64_vc12/sdl/include/SDL_opengl.h
trunk/lib/win64_vc12/sdl/include/SDL_platform.h
trunk/lib/win64_vc12/sdl/include/SDL_quit.h
trunk/lib/win64_vc12/sdl/include/SDL_rwops.h
trunk/lib/win64_vc12/sdl/include/SDL_stdinc.h
trunk/lib/win64_vc12/sdl/include/SDL_syswm.h
trunk/lib/win64_vc12/sdl/include/SDL_thread.h
trunk/lib/win64_vc12/sdl/include/SDL_timer.h
trunk/lib/win64_vc12/sdl/include/SDL_types.h
trunk/lib/win64_vc12/sdl/include/SDL_version.h
trunk/lib/win64_vc12/sdl/include/SDL_video.h
trunk/lib/win64_vc12/sdl/include/begin_code.h
trunk/lib/win64_vc12/sdl/include/close_code.h
Added Paths:
-----------
trunk/lib/win64_vc12/sdl/lib/SDL2.dll
trunk/lib/win64_vc12/sdl/lib/SDL2.lib
trunk/lib/win64_vc12/sdl/lib/SDL2main.lib
Removed Paths:
-------------
trunk/lib/win64_vc12/sdl/include/SDL_active.h
trunk/lib/win64_vc12/sdl/include/SDL_byteorder.h
trunk/lib/win64_vc12/sdl/include/SDL_cdrom.h
trunk/lib/win64_vc12/sdl/include/SDL_config_dreamcast.h
trunk/lib/win64_vc12/sdl/include/SDL_config_macos.h
trunk/lib/win64_vc12/sdl/include/SDL_config_macosx.h
trunk/lib/win64_vc12/sdl/include/SDL_config_minimal.h
trunk/lib/win64_vc12/sdl/include/SDL_config_nds.h
trunk/lib/win64_vc12/sdl/include/SDL_config_os2.h
trunk/lib/win64_vc12/sdl/include/SDL_config_symbian.h
trunk/lib/win64_vc12/sdl/include/SDL_config_win32.h
trunk/lib/win64_vc12/sdl/include/SDL_copying.h
trunk/lib/win64_vc12/sdl/include/SDL_getenv.h
trunk/lib/win64_vc12/sdl/include/SDL_keysym.h
trunk/lib/win64_vc12/sdl/lib/SDL.dll
trunk/lib/win64_vc12/sdl/lib/SDL.lib
trunk/lib/win64_vc12/sdl/lib/SDLmain.lib
Modified: trunk/lib/win64_vc12/sdl/include/SDL.h
===================================================================
--- trunk/lib/win64_vc12/sdl/include/SDL.h 2014-11-05 18:37:24 UTC (rev 61435)
+++ trunk/lib/win64_vc12/sdl/include/SDL.h 2014-11-13 15:20:40 UTC (rev 61436)
@@ -1,47 +1,96 @@
/*
- SDL - Simple DirectMedia Layer
- Copyright (C) 1997-2012 Sam Lantinga
+ Simple DirectMedia Layer
+ Copyright (C) 1997-2014 Sam Lantinga <slouken at libsdl.org>
- 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 software is provided 'as-is', without any express or implied
+ warranty. In no event will the authors be held liable for any damages
+ arising from the use of this software.
- 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.
+ Permission is granted to anyone to use this software for any purpose,
+ including commercial applications, and to alter it and redistribute it
+ freely, subject to the following restrictions:
- 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
+ 1. The origin of this software must not be misrepresented; you must not
+ claim that you wrote the original software. If you use this software
+ in a product, an acknowledgment in the product documentation would be
+ appreciated but is not required.
+ 2. Altered source versions must be plainly marked as such, and must not be
+ misrepresented as being the original software.
+ 3. This notice may not be removed or altered from any source distribution.
*/
-/** @file SDL.h
+/**
+ * \file SDL.h
+ *
* Main include header for the SDL library
*/
+/**
+ * \mainpage Simple DirectMedia Layer (SDL)
+ *
+ * http://www.libsdl.org/
+ *
+ * \section intro_sec Introduction
+ *
+ * Simple DirectMedia Layer is a cross-platform development library designed
+ * to provide low level access to audio, keyboard, mouse, joystick, and
+ * graphics hardware via OpenGL and Direct3D. It is used by video playback
+ * software, emulators, and popular games including Valve's award winning
+ * catalog and many Humble Bundle games.
+ *
+ * SDL officially supports Windows, Mac OS X, Linux, iOS, and Android.
+ * Support for other platforms may be found in the source code.
+ *
+ * SDL is written in C, works natively with C++, and there are bindings
+ * available for several other languages, including C# and Python.
+ *
+ * This library is distributed under the zlib license, which can be found
+ * in the file "COPYING.txt".
+ *
+ * The best way to learn how to use SDL is to check out the header files in
+ * the "include" subdirectory and the programs in the "test" subdirectory.
+ * The header files and test programs are well commented and always up to date.
+ * More documentation and FAQs are available online at:
+ * http://wiki.libsdl.org/
+ *
+ * If you need help with the library, or just want to discuss SDL related
+ * issues, you can join the developers mailing list:
+ * http://www.libsdl.org/mailing-list.php
+ *
+ * Enjoy!
+ * Sam Lantinga (slouken at libsdl.org)
+ */
+
#ifndef _SDL_H
#define _SDL_H
#include "SDL_main.h"
#include "SDL_stdinc.h"
+#include "SDL_assert.h"
+#include "SDL_atomic.h"
#include "SDL_audio.h"
-#include "SDL_cdrom.h"
+#include "SDL_clipboard.h"
#include "SDL_cpuinfo.h"
#include "SDL_endian.h"
#include "SDL_error.h"
#include "SDL_events.h"
+#include "SDL_filesystem.h"
+#include "SDL_joystick.h"
+#include "SDL_gamecontroller.h"
+#include "SDL_haptic.h"
+#include "SDL_hints.h"
#include "SDL_loadso.h"
+#include "SDL_log.h"
+#include "SDL_messagebox.h"
#include "SDL_mutex.h"
+#include "SDL_power.h"
+#include "SDL_render.h"
#include "SDL_rwops.h"
+#include "SDL_system.h"
#include "SDL_thread.h"
#include "SDL_timer.h"
+#include "SDL_version.h"
#include "SDL_video.h"
-#include "SDL_version.h"
#include "begin_code.h"
/* Set up for C function definitions, even when using C++ */
@@ -49,46 +98,57 @@
extern "C" {
#endif
-/** @file SDL.h
- * @note As of version 0.5, SDL is loaded dynamically into the application
- */
+/* As of version 0.5, SDL is loaded dynamically into the application */
-/** @name SDL_INIT Flags
- * These are the flags which may be passed to SDL_Init() -- you should
+/**
+ * \name SDL_INIT_*
+ *
+ * These are the flags which may be passed to SDL_Init(). You should
* specify the subsystems which you will be using in your application.
*/
-/*@{*/
-#define SDL_INIT_TIMER 0x00000001
-#define SDL_INIT_AUDIO 0x00000010
-#define SDL_INIT_VIDEO 0x00000020
-#define SDL_INIT_CDROM 0x00000100
-#define SDL_INIT_JOYSTICK 0x00000200
-#define SDL_INIT_NOPARACHUTE 0x00100000 /**< Don't catch fatal signals */
-#define SDL_INIT_EVENTTHREAD 0x01000000 /**< Not supported on all OS's */
-#define SDL_INIT_EVERYTHING 0x0000FFFF
-/*@}*/
+/* @{ */
+#define SDL_INIT_TIMER 0x00000001
+#define SDL_INIT_AUDIO 0x00000010
+#define SDL_INIT_VIDEO 0x00000020 /**< SDL_INIT_VIDEO implies SDL_INIT_EVENTS */
+#define SDL_INIT_JOYSTICK 0x00000200 /**< SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS */
+#define SDL_INIT_HAPTIC 0x00001000
+#define SDL_INIT_GAMECONTROLLER 0x00002000 /**< SDL_INIT_GAMECONTROLLER implies SDL_INIT_JOYSTICK */
+#define SDL_INIT_EVENTS 0x00004000
+#define SDL_INIT_NOPARACHUTE 0x00100000 /**< Don't catch fatal signals */
+#define SDL_INIT_EVERYTHING ( \
+ SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | SDL_INIT_EVENTS | \
+ SDL_INIT_JOYSTICK | SDL_INIT_HAPTIC | SDL_INIT_GAMECONTROLLER \
+ )
+/* @} */
-/** This function loads the SDL dynamically linked library and initializes
- * the subsystems specified by 'flags' (and those satisfying dependencies)
- * Unless the SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
- * signal handlers for some commonly ignored fatal signals (like SIGSEGV)
+/**
+ * This function initializes the subsystems specified by \c flags
+ * Unless the ::SDL_INIT_NOPARACHUTE flag is set, it will install cleanup
+ * signal handlers for some commonly ignored fatal signals (like SIGSEGV).
*/
extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
-/** This function initializes specific SDL subsystems */
+/**
+ * This function initializes specific SDL subsystems
+ */
extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
-/** This function cleans up specific SDL subsystems */
+/**
+ * This function cleans up specific SDL subsystems
+ */
extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
-/** This function returns mask of the specified subsystems which have
- * been initialized.
- * If 'flags' is 0, it returns a mask of all initialized subsystems.
+/**
+ * This function returns a mask of the specified subsystems which have
+ * previously been initialized.
+ *
+ * If \c flags is 0, it returns a mask of all initialized subsystems.
*/
extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
-/** This function cleans up all initialized subsystems and unloads the
- * dynamically linked library. You should call it upon all exit conditions.
+/**
+ * This function cleans up all initialized subsystems. You should
+ * call it upon all exit conditions.
*/
extern DECLSPEC void SDLCALL SDL_Quit(void);
@@ -99,3 +159,5 @@
#include "close_code.h"
#endif /* _SDL_H */
+
+/* vi: set ts=4 sw=4 expandtab: */
Deleted: trunk/lib/win64_vc12/sdl/include/SDL_active.h
===================================================================
--- trunk/lib/win64_vc12/sdl/include/SDL_active.h 2014-11-05 18:37:24 UTC (rev 61435)
+++ trunk/lib/win64_vc12/sdl/include/SDL_active.h 2014-11-13 15:20:40 UTC (rev 61436)
@@ -1,63 +0,0 @@
-/*
- SDL - Simple DirectMedia Layer
- 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
- 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 at libsdl.org
-*/
-
-/**
- * @file SDL_active.h
- * 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
-extern "C" {
-#endif
-
-/** @name The available application states */
-/*@{*/
-#define SDL_APPMOUSEFOCUS 0x01 /**< The app has mouse coverage */
-#define SDL_APPINPUTFOCUS 0x02 /**< The app has input focus */
-#define SDL_APPACTIVE 0x04 /**< The application is active */
-/*@}*/
-
-/* Function prototypes */
-/**
- * This function returns the current state of the application, which is a
- * bitwise combination of SDL_APPMOUSEFOCUS, SDL_APPINPUTFOCUS, and
- * SDL_APPACTIVE. If SDL_APPACTIVE is set, then the user is able to
- * see your application, otherwise it has been iconified or disabled.
- */
-extern DECLSPEC Uint8 SDLCALL SDL_GetAppState(void);
-
-
-/* Ends C function definitions when using C++ */
-#ifdef __cplusplus
-}
-#endif
-#include "close_code.h"
-
-#endif /* _SDL_active_h */
Modified: trunk/lib/win64_vc12/sdl/include/SDL_audio.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list