[Bf-blender-cvs] SVN commit: /data/svn/repos/bf-blender [61672] trunk/lib/win64_vc14/sdl: MSVC 2015 windows x64 (vc140) SDL2

Martijn Berger martijn.berger at gmail.com
Tue May 31 14:39:53 CEST 2016


Revision: 61672
          https://developer.blender.org/rBL61672
Author:   juicyfruit
Date:     2016-05-31 14:39:53 +0200 (Tue, 31 May 2016)
Log Message:
-----------
MSVC 2015 windows x64 (vc140) SDL2

Added Paths:
-----------
    trunk/lib/win64_vc14/sdl/
    trunk/lib/win64_vc14/sdl/include/
    trunk/lib/win64_vc14/sdl/include/SDL.h
    trunk/lib/win64_vc14/sdl/include/SDL_assert.h
    trunk/lib/win64_vc14/sdl/include/SDL_atomic.h
    trunk/lib/win64_vc14/sdl/include/SDL_audio.h
    trunk/lib/win64_vc14/sdl/include/SDL_bits.h
    trunk/lib/win64_vc14/sdl/include/SDL_blendmode.h
    trunk/lib/win64_vc14/sdl/include/SDL_clipboard.h
    trunk/lib/win64_vc14/sdl/include/SDL_config.h
    trunk/lib/win64_vc14/sdl/include/SDL_cpuinfo.h
    trunk/lib/win64_vc14/sdl/include/SDL_egl.h
    trunk/lib/win64_vc14/sdl/include/SDL_endian.h
    trunk/lib/win64_vc14/sdl/include/SDL_error.h
    trunk/lib/win64_vc14/sdl/include/SDL_events.h
    trunk/lib/win64_vc14/sdl/include/SDL_filesystem.h
    trunk/lib/win64_vc14/sdl/include/SDL_gamecontroller.h
    trunk/lib/win64_vc14/sdl/include/SDL_gesture.h
    trunk/lib/win64_vc14/sdl/include/SDL_haptic.h
    trunk/lib/win64_vc14/sdl/include/SDL_hints.h
    trunk/lib/win64_vc14/sdl/include/SDL_joystick.h
    trunk/lib/win64_vc14/sdl/include/SDL_keyboard.h
    trunk/lib/win64_vc14/sdl/include/SDL_keycode.h
    trunk/lib/win64_vc14/sdl/include/SDL_loadso.h
    trunk/lib/win64_vc14/sdl/include/SDL_log.h
    trunk/lib/win64_vc14/sdl/include/SDL_main.h
    trunk/lib/win64_vc14/sdl/include/SDL_messagebox.h
    trunk/lib/win64_vc14/sdl/include/SDL_mouse.h
    trunk/lib/win64_vc14/sdl/include/SDL_mutex.h
    trunk/lib/win64_vc14/sdl/include/SDL_name.h
    trunk/lib/win64_vc14/sdl/include/SDL_opengl.h
    trunk/lib/win64_vc14/sdl/include/SDL_opengl_glext.h
    trunk/lib/win64_vc14/sdl/include/SDL_opengles.h
    trunk/lib/win64_vc14/sdl/include/SDL_opengles2.h
    trunk/lib/win64_vc14/sdl/include/SDL_opengles2_gl2.h
    trunk/lib/win64_vc14/sdl/include/SDL_opengles2_gl2ext.h
    trunk/lib/win64_vc14/sdl/include/SDL_opengles2_gl2platform.h
    trunk/lib/win64_vc14/sdl/include/SDL_opengles2_khrplatform.h
    trunk/lib/win64_vc14/sdl/include/SDL_pixels.h
    trunk/lib/win64_vc14/sdl/include/SDL_platform.h
    trunk/lib/win64_vc14/sdl/include/SDL_power.h
    trunk/lib/win64_vc14/sdl/include/SDL_quit.h
    trunk/lib/win64_vc14/sdl/include/SDL_rect.h
    trunk/lib/win64_vc14/sdl/include/SDL_render.h
    trunk/lib/win64_vc14/sdl/include/SDL_revision.h
    trunk/lib/win64_vc14/sdl/include/SDL_rwops.h
    trunk/lib/win64_vc14/sdl/include/SDL_scancode.h
    trunk/lib/win64_vc14/sdl/include/SDL_shape.h
    trunk/lib/win64_vc14/sdl/include/SDL_stdinc.h
    trunk/lib/win64_vc14/sdl/include/SDL_surface.h
    trunk/lib/win64_vc14/sdl/include/SDL_system.h
    trunk/lib/win64_vc14/sdl/include/SDL_syswm.h
    trunk/lib/win64_vc14/sdl/include/SDL_test.h
    trunk/lib/win64_vc14/sdl/include/SDL_test_assert.h
    trunk/lib/win64_vc14/sdl/include/SDL_test_common.h
    trunk/lib/win64_vc14/sdl/include/SDL_test_compare.h
    trunk/lib/win64_vc14/sdl/include/SDL_test_crc32.h
    trunk/lib/win64_vc14/sdl/include/SDL_test_font.h
    trunk/lib/win64_vc14/sdl/include/SDL_test_fuzzer.h
    trunk/lib/win64_vc14/sdl/include/SDL_test_harness.h
    trunk/lib/win64_vc14/sdl/include/SDL_test_images.h
    trunk/lib/win64_vc14/sdl/include/SDL_test_log.h
    trunk/lib/win64_vc14/sdl/include/SDL_test_md5.h
    trunk/lib/win64_vc14/sdl/include/SDL_test_random.h
    trunk/lib/win64_vc14/sdl/include/SDL_thread.h
    trunk/lib/win64_vc14/sdl/include/SDL_timer.h
    trunk/lib/win64_vc14/sdl/include/SDL_touch.h
    trunk/lib/win64_vc14/sdl/include/SDL_types.h
    trunk/lib/win64_vc14/sdl/include/SDL_version.h
    trunk/lib/win64_vc14/sdl/include/SDL_video.h
    trunk/lib/win64_vc14/sdl/include/begin_code.h
    trunk/lib/win64_vc14/sdl/include/close_code.h
    trunk/lib/win64_vc14/sdl/lib/
    trunk/lib/win64_vc14/sdl/lib/SDL2.dll
    trunk/lib/win64_vc14/sdl/lib/SDL2.lib
    trunk/lib/win64_vc14/sdl/lib/SDL2main.lib

Added: trunk/lib/win64_vc14/sdl/include/SDL.h
===================================================================
--- trunk/lib/win64_vc14/sdl/include/SDL.h	                        (rev 0)
+++ trunk/lib/win64_vc14/sdl/include/SDL.h	2016-05-31 12:39:53 UTC (rev 61672)
@@ -0,0 +1,132 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2016 Sam Lantinga <slouken at libsdl.org>
+
+  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.
+
+  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:
+
+  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
+ *
+ *  Main include header for the SDL library
+ */
+
+
+#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_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 "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* As of version 0.5, SDL is loaded dynamically into the application */
+
+/**
+ *  \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  /**< 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  /**< compatibility; this flag is ignored. */
+#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 initializes  the subsystems specified by \c flags
+ */
+extern DECLSPEC int SDLCALL SDL_Init(Uint32 flags);
+
+/**
+ *  This function initializes specific SDL subsystems
+ *
+ *  Subsystem initialization is ref-counted, you must call
+ *  SDL_QuitSubSystem for each SDL_InitSubSystem to correctly
+ *  shutdown a subsystem manually (or call SDL_Quit to force shutdown).
+ *  If a subsystem is already loaded then this call will
+ *  increase the ref-count and return.
+ */
+extern DECLSPEC int SDLCALL SDL_InitSubSystem(Uint32 flags);
+
+/**
+ *  This function cleans up specific SDL subsystems
+ */
+extern DECLSPEC void SDLCALL SDL_QuitSubSystem(Uint32 flags);
+
+/**
+ *  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. You should
+ *  call it upon all exit conditions.
+ */
+extern DECLSPEC void SDLCALL SDL_Quit(void);
+
+/* Ends C function definitions when using C++ */
+#ifdef __cplusplus
+}
+#endif
+#include "close_code.h"
+
+#endif /* _SDL_H */
+
+/* vi: set ts=4 sw=4 expandtab: */

Added: trunk/lib/win64_vc14/sdl/include/SDL_assert.h
===================================================================
--- trunk/lib/win64_vc14/sdl/include/SDL_assert.h	                        (rev 0)
+++ trunk/lib/win64_vc14/sdl/include/SDL_assert.h	2016-05-31 12:39:53 UTC (rev 61672)
@@ -0,0 +1,289 @@
+/*
+  Simple DirectMedia Layer
+  Copyright (C) 1997-2016 Sam Lantinga <slouken at libsdl.org>
+
+  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.
+
+  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:
+
+  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.
+*/
+
+#ifndef _SDL_assert_h
+#define _SDL_assert_h
+
+#include "SDL_config.h"
+
+#include "begin_code.h"
+/* Set up for C function definitions, even when using C++ */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef SDL_ASSERT_LEVEL
+#ifdef SDL_DEFAULT_ASSERT_LEVEL
+#define SDL_ASSERT_LEVEL SDL_DEFAULT_ASSERT_LEVEL
+#elif defined(_DEBUG) || defined(DEBUG) || \
+      (defined(__GNUC__) && !defined(__OPTIMIZE__))
+#define SDL_ASSERT_LEVEL 2
+#else
+#define SDL_ASSERT_LEVEL 1
+#endif
+#endif /* SDL_ASSERT_LEVEL */
+
+/*
+These are macros and not first class functions so that the debugger breaks
+on the assertion line and not in some random guts of SDL, and so each
+assert can have unique static variables associated with it.
+*/
+
+#if defined(_MSC_VER)
+/* Don't include intrin.h here because it contains C++ code */
+    extern void __cdecl __debugbreak(void);
+    #define SDL_TriggerBreakpoint() __debugbreak()
+#elif (!defined(__NACL__) && defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)))
+    #define SDL_TriggerBreakpoint() __asm__ __volatile__ ( "int $3\n\t" )
+#elif defined(HAVE_SIGNAL_H)
+    #include <signal.h>
+    #define SDL_TriggerBreakpoint() raise(SIGTRAP)
+#else
+    /* How do we trigger breakpoints on this platform? */
+    #define SDL_TriggerBreakpoint()
+#endif
+
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901L) /* C99 supports __func__ as a standard. */
+#   define SDL_FUNCTION __func__
+#elif ((__GNUC__ >= 2) || defined(_MSC_VER))
+#   define SDL_FUNCTION __FUNCTION__
+#else
+#   define SDL_FUNCTION "???"
+#endif
+#define SDL_FILE    __FILE__
+#define SDL_LINE    __LINE__
+
+/*
+sizeof (x) makes the compiler still parse the expression even without
+assertions enabled, so the code is always checked at compile time, but
+doesn't actually generate code for it, so there are no side effects or
+expensive checks at run time, just the constant size of what x WOULD be,
+which presumably gets optimized out as unused.
+This also solves the problem of...
+
+    int somevalue = blah();
+    SDL_assert(somevalue == 1);
+
+...which would cause compiles to complain that somevalue is unused if we
+disable assertions.
+*/
+
+/* "while (0,0)" fools Microsoft's compiler's /W4 warning level into thinking
+    this condition isn't constant. And looks like an owl's face! */
+#ifdef _MSC_VER  /* stupid /W4 warnings. */
+#define SDL_NULL_WHILE_LOOP_CONDITION (0,0)
+#else
+#define SDL_NULL_WHILE_LOOP_CONDITION (0)
+#endif
+
+#define SDL_disabled_assert(condition) \
+    do { (void) sizeof ((condition)); } while (SDL_NULL_WHILE_LOOP_CONDITION)
+
+typedef enum
+{
+    SDL_ASSERTION_RETRY,  /**< Retry the assert immediately. */
+    SDL_ASSERTION_BREAK,  /**< Make the debugger trigger a breakpoint. */
+    SDL_ASSERTION_ABORT,  /**< Terminate the program. */
+    SDL_ASSERTION_IGNORE,  /**< Ignore the assert. */
+    SDL_ASSERTION_ALWAYS_IGNORE  /**< Ignore the assert from now on. */
+} SDL_AssertState;
+
+typedef struct SDL_AssertData
+{
+    int always_ignore;
+    unsigned int trigger_count;
+    const char *condition;
+    const char *filename;
+    int linenum;
+    const char *function;
+    const struct SDL_AssertData *next;
+} SDL_AssertData;
+
+#if (SDL_ASSERT_LEVEL > 0)
+
+/* Never call this directly. Use the SDL_assert* macros. */
+extern DECLSPEC SDL_AssertState SDLCALL SDL_ReportAssertion(SDL_AssertData *,
+                                                             const char *,
+                                                             const char *, int)
+#if defined(__clang__)
+#if __has_feature(attribute_analyzer_noreturn)
+/* this tells Clang's static analysis that we're a custom assert function,
+   and that the analyzer should assume the condition was always true past this
+   SDL_assert test. */
+   __attribute__((analyzer_noreturn))
+#endif
+#endif
+;
+
+/* the do {} while(0) avoids dangling else problems:
+    if (x) SDL_assert(y); else blah();
+       ... without the do/while, the "else" could attach to this macro's "if".
+   We try to handle just the minimum we need here in a macro...the loop,
+   the static vars, and break points. The heavy lifting is handled in
+   SDL_ReportAssertion(), in SDL_assert.c.
+*/
+#define SDL_enabled_assert(condition) \
+    do { \
+        while ( !(condition) ) { \
+            static struct SDL_AssertData sdl_assert_data = { \
+                0, 0, #condition, 0, 0, 0, 0 \
+            }; \
+            const SDL_AssertState sdl_assert_state = SDL_ReportAssertion(&sdl_assert_data, SDL_FUNCTION, SDL_FILE, SDL_LINE); \
+            if (sdl_assert_state == SDL_ASSERTION_RETRY) { \
+                continue; /* go again. */ \
+            } else if (sdl_assert_state == SDL_ASSERTION_BREAK) { \

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list