1.1 --- a/include/SDL_name.h Thu Mar 13 00:40:08 2014 -0700
1.2 +++ b/include/SDL_name.h Thu Mar 13 21:21:26 2014 -0700
1.3 @@ -1,3 +1,23 @@
1.4 +/*
1.5 + Simple DirectMedia Layer
1.6 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
1.7 +
1.8 + This software is provided 'as-is', without any express or implied
1.9 + warranty. In no event will the authors be held liable for any damages
1.10 + arising from the use of this software.
1.11 +
1.12 + Permission is granted to anyone to use this software for any purpose,
1.13 + including commercial applications, and to alter it and redistribute it
1.14 + freely, subject to the following restrictions:
1.15 +
1.16 + 1. The origin of this software must not be misrepresented; you must not
1.17 + claim that you wrote the original software. If you use this software
1.18 + in a product, an acknowledgment in the product documentation would be
1.19 + appreciated but is not required.
1.20 + 2. Altered source versions must be plainly marked as such, and must not be
1.21 + misrepresented as being the original software.
1.22 + 3. This notice may not be removed or altered from any source distribution.
1.23 +*/
1.24
1.25 #ifndef _SDLname_h_
1.26 #define _SDLname_h_
1.27 @@ -9,3 +29,5 @@
1.28 #define SDL_NAME(X) SDL_##X
1.29
1.30 #endif /* _SDLname_h_ */
1.31 +
1.32 +/* vi: set ts=4 sw=4 expandtab: */
2.1 --- a/src/audio/directsound/directx.h Thu Mar 13 00:40:08 2014 -0700
2.2 +++ b/src/audio/directsound/directx.h Thu Mar 13 21:21:26 2014 -0700
2.3 @@ -1,3 +1,23 @@
2.4 +/*
2.5 + Simple DirectMedia Layer
2.6 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
2.7 +
2.8 + This software is provided 'as-is', without any express or implied
2.9 + warranty. In no event will the authors be held liable for any damages
2.10 + arising from the use of this software.
2.11 +
2.12 + Permission is granted to anyone to use this software for any purpose,
2.13 + including commercial applications, and to alter it and redistribute it
2.14 + freely, subject to the following restrictions:
2.15 +
2.16 + 1. The origin of this software must not be misrepresented; you must not
2.17 + claim that you wrote the original software. If you use this software
2.18 + in a product, an acknowledgment in the product documentation would be
2.19 + appreciated but is not required.
2.20 + 2. Altered source versions must be plainly marked as such, and must not be
2.21 + misrepresented as being the original software.
2.22 + 3. This notice may not be removed or altered from any source distribution.
2.23 +*/
2.24
2.25 #ifndef _directx_h
2.26 #define _directx_h
2.27 @@ -78,4 +98,5 @@
2.28 #include <dinput.h>
2.29
2.30 #endif /* _directx_h */
2.31 +
2.32 /* vi: set ts=4 sw=4 expandtab: */
3.1 --- a/src/audio/xaudio2/SDL_xaudio2_winrthelpers.cpp Thu Mar 13 00:40:08 2014 -0700
3.2 +++ b/src/audio/xaudio2/SDL_xaudio2_winrthelpers.cpp Thu Mar 13 21:21:26 2014 -0700
3.3 @@ -1,3 +1,24 @@
3.4 +/*
3.5 + Simple DirectMedia Layer
3.6 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
3.7 +
3.8 + This software is provided 'as-is', without any express or implied
3.9 + warranty. In no event will the authors be held liable for any damages
3.10 + arising from the use of this software.
3.11 +
3.12 + Permission is granted to anyone to use this software for any purpose,
3.13 + including commercial applications, and to alter it and redistribute it
3.14 + freely, subject to the following restrictions:
3.15 +
3.16 + 1. The origin of this software must not be misrepresented; you must not
3.17 + claim that you wrote the original software. If you use this software
3.18 + in a product, an acknowledgment in the product documentation would be
3.19 + appreciated but is not required.
3.20 + 2. Altered source versions must be plainly marked as such, and must not be
3.21 + misrepresented as being the original software.
3.22 + 3. This notice may not be removed or altered from any source distribution.
3.23 +*/
3.24 +#include "../../SDL_internal.h"
3.25
3.26 #include <xaudio2.h>
3.27 #include "SDL_xaudio2_winrthelpers.h"
4.1 --- a/src/audio/xaudio2/SDL_xaudio2_winrthelpers.h Thu Mar 13 00:40:08 2014 -0700
4.2 +++ b/src/audio/xaudio2/SDL_xaudio2_winrthelpers.h Thu Mar 13 21:21:26 2014 -0700
4.3 @@ -1,5 +1,23 @@
4.4 +/*
4.5 + Simple DirectMedia Layer
4.6 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
4.7
4.8 -#pragma once
4.9 + This software is provided 'as-is', without any express or implied
4.10 + warranty. In no event will the authors be held liable for any damages
4.11 + arising from the use of this software.
4.12 +
4.13 + Permission is granted to anyone to use this software for any purpose,
4.14 + including commercial applications, and to alter it and redistribute it
4.15 + freely, subject to the following restrictions:
4.16 +
4.17 + 1. The origin of this software must not be misrepresented; you must not
4.18 + claim that you wrote the original software. If you use this software
4.19 + in a product, an acknowledgment in the product documentation would be
4.20 + appreciated but is not required.
4.21 + 2. Altered source versions must be plainly marked as such, and must not be
4.22 + misrepresented as being the original software.
4.23 + 3. This notice may not be removed or altered from any source distribution.
4.24 +*/
4.25
4.26 //
4.27 // Re-implementation of methods removed from XAudio2 (in WinRT):
5.1 --- a/src/core/winrt/SDL_winrtapp_common.cpp Thu Mar 13 00:40:08 2014 -0700
5.2 +++ b/src/core/winrt/SDL_winrtapp_common.cpp Thu Mar 13 21:21:26 2014 -0700
5.3 @@ -1,5 +1,26 @@
5.4 +/*
5.5 + Simple DirectMedia Layer
5.6 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
5.7
5.8 -#include <SDL_system.h>
5.9 + This software is provided 'as-is', without any express or implied
5.10 + warranty. In no event will the authors be held liable for any damages
5.11 + arising from the use of this software.
5.12 +
5.13 + Permission is granted to anyone to use this software for any purpose,
5.14 + including commercial applications, and to alter it and redistribute it
5.15 + freely, subject to the following restrictions:
5.16 +
5.17 + 1. The origin of this software must not be misrepresented; you must not
5.18 + claim that you wrote the original software. If you use this software
5.19 + in a product, an acknowledgment in the product documentation would be
5.20 + appreciated but is not required.
5.21 + 2. Altered source versions must be plainly marked as such, and must not be
5.22 + misrepresented as being the original software.
5.23 + 3. This notice may not be removed or altered from any source distribution.
5.24 +*/
5.25 +#include "../../SDL_internal.h"
5.26 +
5.27 +#include "SDL_system.h"
5.28 #include "SDL_winrtapp_direct3d.h"
5.29 #include "SDL_winrtapp_xaml.h"
5.30
6.1 --- a/src/core/winrt/SDL_winrtapp_direct3d.cpp Thu Mar 13 00:40:08 2014 -0700
6.2 +++ b/src/core/winrt/SDL_winrtapp_direct3d.cpp Thu Mar 13 21:21:26 2014 -0700
6.3 @@ -1,4 +1,25 @@
6.4 -
6.5 +/*
6.6 + Simple DirectMedia Layer
6.7 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
6.8 +
6.9 + This software is provided 'as-is', without any express or implied
6.10 + warranty. In no event will the authors be held liable for any damages
6.11 + arising from the use of this software.
6.12 +
6.13 + Permission is granted to anyone to use this software for any purpose,
6.14 + including commercial applications, and to alter it and redistribute it
6.15 + freely, subject to the following restrictions:
6.16 +
6.17 + 1. The origin of this software must not be misrepresented; you must not
6.18 + claim that you wrote the original software. If you use this software
6.19 + in a product, an acknowledgment in the product documentation would be
6.20 + appreciated but is not required.
6.21 + 2. Altered source versions must be plainly marked as such, and must not be
6.22 + misrepresented as being the original software.
6.23 + 3. This notice may not be removed or altered from any source distribution.
6.24 +*/
6.25 +#include "../../SDL_internal.h"
6.26 +
6.27 /* Standard C++11 includes */
6.28 #include <functional>
6.29 #include <string>
7.1 --- a/src/core/winrt/SDL_winrtapp_direct3d.h Thu Mar 13 00:40:08 2014 -0700
7.2 +++ b/src/core/winrt/SDL_winrtapp_direct3d.h Thu Mar 13 21:21:26 2014 -0700
7.3 @@ -1,5 +1,23 @@
7.4 -#pragma once
7.5 +/*
7.6 + Simple DirectMedia Layer
7.7 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
7.8
7.9 + This software is provided 'as-is', without any express or implied
7.10 + warranty. In no event will the authors be held liable for any damages
7.11 + arising from the use of this software.
7.12 +
7.13 + Permission is granted to anyone to use this software for any purpose,
7.14 + including commercial applications, and to alter it and redistribute it
7.15 + freely, subject to the following restrictions:
7.16 +
7.17 + 1. The origin of this software must not be misrepresented; you must not
7.18 + claim that you wrote the original software. If you use this software
7.19 + in a product, an acknowledgment in the product documentation would be
7.20 + appreciated but is not required.
7.21 + 2. Altered source versions must be plainly marked as such, and must not be
7.22 + misrepresented as being the original software.
7.23 + 3. This notice may not be removed or altered from any source distribution.
7.24 +*/
7.25 #include <Windows.h>
7.26
7.27 extern int SDL_WinRTInitNonXAMLApp(int (*mainFunction)(int, char **));
8.1 --- a/src/file/cocoa/SDL_rwopsbundlesupport.h Thu Mar 13 00:40:08 2014 -0700
8.2 +++ b/src/file/cocoa/SDL_rwopsbundlesupport.h Thu Mar 13 21:21:26 2014 -0700
8.3 @@ -1,4 +1,25 @@
8.4 -#ifdef __APPLE__
8.5 +/*
8.6 + Simple DirectMedia Layer
8.7 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
8.8 +
8.9 + This software is provided 'as-is', without any express or implied
8.10 + warranty. In no event will the authors be held liable for any damages
8.11 + arising from the use of this software.
8.12 +
8.13 + Permission is granted to anyone to use this software for any purpose,
8.14 + including commercial applications, and to alter it and redistribute it
8.15 + freely, subject to the following restrictions:
8.16 +
8.17 + 1. The origin of this software must not be misrepresented; you must not
8.18 + claim that you wrote the original software. If you use this software
8.19 + in a product, an acknowledgment in the product documentation would be
8.20 + appreciated but is not required.
8.21 + 2. Altered source versions must be plainly marked as such, and must not be
8.22 + misrepresented as being the original software.
8.23 + 3. This notice may not be removed or altered from any source distribution.
8.24 +*/
8.25 +
8.26 +#ifdef __MACOSX__
8.27
8.28 #include <stdio.h>
8.29
9.1 --- a/src/file/cocoa/SDL_rwopsbundlesupport.m Thu Mar 13 00:40:08 2014 -0700
9.2 +++ b/src/file/cocoa/SDL_rwopsbundlesupport.m Thu Mar 13 21:21:26 2014 -0700
9.3 @@ -1,4 +1,26 @@
9.4 -#ifdef __APPLE__
9.5 +/*
9.6 + Simple DirectMedia Layer
9.7 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
9.8 +
9.9 + This software is provided 'as-is', without any express or implied
9.10 + warranty. In no event will the authors be held liable for any damages
9.11 + arising from the use of this software.
9.12 +
9.13 + Permission is granted to anyone to use this software for any purpose,
9.14 + including commercial applications, and to alter it and redistribute it
9.15 + freely, subject to the following restrictions:
9.16 +
9.17 + 1. The origin of this software must not be misrepresented; you must not
9.18 + claim that you wrote the original software. If you use this software
9.19 + in a product, an acknowledgment in the product documentation would be
9.20 + appreciated but is not required.
9.21 + 2. Altered source versions must be plainly marked as such, and must not be
9.22 + misrepresented as being the original software.
9.23 + 3. This notice may not be removed or altered from any source distribution.
9.24 +*/
9.25 +#include "../../SDL_internal.h"
9.26 +
9.27 +#ifdef __MACOSX__
9.28 #import <Foundation/Foundation.h>
9.29
9.30 #include "SDL_rwopsbundlesupport.h"
9.31 @@ -42,4 +64,7 @@
9.32
9.33 return fp;
9.34 }
9.35 -#endif
9.36 +
9.37 +#endif /* __MACOSX__ */
9.38 +
9.39 +/* vi: set ts=4 sw=4 expandtab: */
10.1 --- a/src/filesystem/winrt/SDL_sysfilesystem.cpp Thu Mar 13 00:40:08 2014 -0700
10.2 +++ b/src/filesystem/winrt/SDL_sysfilesystem.cpp Thu Mar 13 21:21:26 2014 -0700
10.3 @@ -1,9 +1,29 @@
10.4 +/*
10.5 + Simple DirectMedia Layer
10.6 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
10.7 +
10.8 + This software is provided 'as-is', without any express or implied
10.9 + warranty. In no event will the authors be held liable for any damages
10.10 + arising from the use of this software.
10.11 +
10.12 + Permission is granted to anyone to use this software for any purpose,
10.13 + including commercial applications, and to alter it and redistribute it
10.14 + freely, subject to the following restrictions:
10.15 +
10.16 + 1. The origin of this software must not be misrepresented; you must not
10.17 + claim that you wrote the original software. If you use this software
10.18 + in a product, an acknowledgment in the product documentation would be
10.19 + appreciated but is not required.
10.20 + 2. Altered source versions must be plainly marked as such, and must not be
10.21 + misrepresented as being the original software.
10.22 + 3. This notice may not be removed or altered from any source distribution.
10.23 +*/
10.24 +#include "../../SDL_internal.h"
10.25 +
10.26 /* TODO, WinRT: include copyright info in SDL_winrtpaths.cpp
10.27 TODO, WinRT: remove the need to compile this with C++/CX (/ZW) extensions, and if possible, without C++ at all
10.28 */
10.29
10.30 -#include "../../SDL_internal.h"
10.31 -
10.32 #ifdef __WINRT__
10.33
10.34 extern "C" {
11.1 --- a/src/main/android/SDL_android_main.c Thu Mar 13 00:40:08 2014 -0700
11.2 +++ b/src/main/android/SDL_android_main.c Thu Mar 13 21:21:26 2014 -0700
11.3 @@ -1,4 +1,6 @@
11.4 -
11.5 +/*
11.6 + SDL_android_main.c, placed in the public domain by Sam Lantinga 3/13/14
11.7 +*/
11.8 #include "../../SDL_internal.h"
11.9
11.10 #ifdef __ANDROID__
12.1 --- a/src/main/dummy/SDL_dummy_main.c Thu Mar 13 00:40:08 2014 -0700
12.2 +++ b/src/main/dummy/SDL_dummy_main.c Thu Mar 13 21:21:26 2014 -0700
12.3 @@ -1,6 +1,9 @@
12.4 +/*
12.5 + SDL_dummy_main.c, placed in the public domain by Sam Lantinga 3/13/14
12.6 +*/
12.7 +#include "../../SDL_internal.h"
12.8
12.9 /* Include the SDL main definition header */
12.10 -#include "../../SDL_internal.h"
12.11 #include "SDL_main.h"
12.12
12.13 #ifdef main
13.1 --- a/src/main/haiku/SDL_BeApp.h Thu Mar 13 00:40:08 2014 -0700
13.2 +++ b/src/main/haiku/SDL_BeApp.h Thu Mar 13 21:21:26 2014 -0700
13.3 @@ -20,7 +20,6 @@
13.4 */
13.5 #include "../../SDL_internal.h"
13.6
13.7 -
13.8 #ifdef __cplusplus
13.9 extern "C" {
13.10 #endif
14.1 --- a/src/main/psp/SDL_psp_main.c Thu Mar 13 00:40:08 2014 -0700
14.2 +++ b/src/main/psp/SDL_psp_main.c Thu Mar 13 21:21:26 2014 -0700
14.3 @@ -1,22 +1,5 @@
14.4 /*
14.5 - Simple DirectMedia Layer
14.6 - Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
14.7 -
14.8 - This software is provided 'as-is', without any express or implied
14.9 - warranty. In no event will the authors be held liable for any damages
14.10 - arising from the use of this software.
14.11 -
14.12 - Permission is granted to anyone to use this software for any purpose,
14.13 - including commercial applications, and to alter it and redistribute it
14.14 - freely, subject to the following restrictions:
14.15 -
14.16 - 1. The origin of this software must not be misrepresented; you must not
14.17 - claim that you wrote the original software. If you use this software
14.18 - in a product, an acknowledgment in the product documentation would be
14.19 - appreciated but is not required.
14.20 - 2. Altered source versions must be plainly marked as such, and must not be
14.21 - misrepresented as being the original software.
14.22 - 3. This notice may not be removed or altered from any source distribution.
14.23 + SDL_psp_main.c, placed in the public domain by Sam Lantinga 3/13/14
14.24 */
14.25
14.26 #include "SDL_main.h"
15.1 --- a/src/main/windows/SDL_windows_main.c Thu Mar 13 00:40:08 2014 -0700
15.2 +++ b/src/main/windows/SDL_windows_main.c Thu Mar 13 21:21:26 2014 -0700
15.3 @@ -1,5 +1,5 @@
15.4 /*
15.5 - SDL_main.c, placed in the public domain by Sam Lantinga 4/13/98
15.6 + SDL_windows_main.c, placed in the public domain by Sam Lantinga 4/13/98
15.7
15.8 The WinMain function -- calls your program's main() function
15.9 */
16.1 --- a/src/main/winrt/SDL_winrt_main_NonXAML.cpp Thu Mar 13 00:40:08 2014 -0700
16.2 +++ b/src/main/winrt/SDL_winrt_main_NonXAML.cpp Thu Mar 13 21:21:26 2014 -0700
16.3 @@ -1,5 +1,9 @@
16.4 +/*
16.5 + SDL_winrt_main_NonXAML.cpp, placed in the public domain by David Ludwig 3/13/14
16.6 +*/
16.7 +#include "../../../SDL_internal.h"
16.8
16.9 -#include <SDL_main.h>
16.10 +#include "SDL_main.h"
16.11 #include <wrl.h>
16.12
16.13 /* At least one file in any SDL/WinRT app appears to require compilation
17.1 --- a/src/render/opengl/SDL_glfuncs.h Thu Mar 13 00:40:08 2014 -0700
17.2 +++ b/src/render/opengl/SDL_glfuncs.h Thu Mar 13 21:21:26 2014 -0700
17.3 @@ -1,3 +1,24 @@
17.4 +/*
17.5 + Simple DirectMedia Layer
17.6 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
17.7 +
17.8 + This software is provided 'as-is', without any express or implied
17.9 + warranty. In no event will the authors be held liable for any damages
17.10 + arising from the use of this software.
17.11 +
17.12 + Permission is granted to anyone to use this software for any purpose,
17.13 + including commercial applications, and to alter it and redistribute it
17.14 + freely, subject to the following restrictions:
17.15 +
17.16 + 1. The origin of this software must not be misrepresented; you must not
17.17 + claim that you wrote the original software. If you use this software
17.18 + in a product, an acknowledgment in the product documentation would be
17.19 + appreciated but is not required.
17.20 + 2. Altered source versions must be plainly marked as such, and must not be
17.21 + misrepresented as being the original software.
17.22 + 3. This notice may not be removed or altered from any source distribution.
17.23 +*/
17.24 +
17.25 /* list of OpenGL functions sorted alphabetically
17.26 If you need to use a GL function from the SDL video subsystem,
17.27 change its entry from SDL_PROC_UNUSED to SDL_PROC and rebuild.
18.1 --- a/src/render/opengles/SDL_glesfuncs.h Thu Mar 13 00:40:08 2014 -0700
18.2 +++ b/src/render/opengles/SDL_glesfuncs.h Thu Mar 13 21:21:26 2014 -0700
18.3 @@ -1,3 +1,24 @@
18.4 +/*
18.5 + Simple DirectMedia Layer
18.6 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
18.7 +
18.8 + This software is provided 'as-is', without any express or implied
18.9 + warranty. In no event will the authors be held liable for any damages
18.10 + arising from the use of this software.
18.11 +
18.12 + Permission is granted to anyone to use this software for any purpose,
18.13 + including commercial applications, and to alter it and redistribute it
18.14 + freely, subject to the following restrictions:
18.15 +
18.16 + 1. The origin of this software must not be misrepresented; you must not
18.17 + claim that you wrote the original software. If you use this software
18.18 + in a product, an acknowledgment in the product documentation would be
18.19 + appreciated but is not required.
18.20 + 2. Altered source versions must be plainly marked as such, and must not be
18.21 + misrepresented as being the original software.
18.22 + 3. This notice may not be removed or altered from any source distribution.
18.23 +*/
18.24 +
18.25 SDL_PROC(void, glBindTexture, (GLenum, GLuint))
18.26 SDL_PROC(void, glBlendFunc, (GLenum, GLenum))
18.27 SDL_PROC_OES(void, glBlendFuncSeparateOES, (GLenum, GLenum, GLenum, GLenum))
19.1 --- a/src/render/opengles2/SDL_gles2funcs.h Thu Mar 13 00:40:08 2014 -0700
19.2 +++ b/src/render/opengles2/SDL_gles2funcs.h Thu Mar 13 21:21:26 2014 -0700
19.3 @@ -1,3 +1,24 @@
19.4 +/*
19.5 + Simple DirectMedia Layer
19.6 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
19.7 +
19.8 + This software is provided 'as-is', without any express or implied
19.9 + warranty. In no event will the authors be held liable for any damages
19.10 + arising from the use of this software.
19.11 +
19.12 + Permission is granted to anyone to use this software for any purpose,
19.13 + including commercial applications, and to alter it and redistribute it
19.14 + freely, subject to the following restrictions:
19.15 +
19.16 + 1. The origin of this software must not be misrepresented; you must not
19.17 + claim that you wrote the original software. If you use this software
19.18 + in a product, an acknowledgment in the product documentation would be
19.19 + appreciated but is not required.
19.20 + 2. Altered source versions must be plainly marked as such, and must not be
19.21 + misrepresented as being the original software.
19.22 + 3. This notice may not be removed or altered from any source distribution.
19.23 +*/
19.24 +
19.25 SDL_PROC(void, glActiveTexture, (GLenum))
19.26 SDL_PROC(void, glAttachShader, (GLuint, GLuint))
19.27 SDL_PROC(void, glBindAttribLocation, (GLuint, GLuint, const char *))
19.28 @@ -47,4 +68,4 @@
19.29 SDL_PROC(GLenum, glCheckFramebufferStatus, (GLenum))
19.30 SDL_PROC(void, glDeleteFramebuffers, (GLsizei, const GLuint *))
19.31 SDL_PROC(GLint, glGetAttribLocation, (GLuint, const GLchar *))
19.32 -
19.33 \ No newline at end of file
19.34 +
20.1 --- a/src/render/software/SDL_rotate.h Thu Mar 13 00:40:08 2014 -0700
20.2 +++ b/src/render/software/SDL_rotate.h Thu Mar 13 21:21:26 2014 -0700
20.3 @@ -1,3 +1,24 @@
20.4 +/*
20.5 + Simple DirectMedia Layer
20.6 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
20.7 +
20.8 + This software is provided 'as-is', without any express or implied
20.9 + warranty. In no event will the authors be held liable for any damages
20.10 + arising from the use of this software.
20.11 +
20.12 + Permission is granted to anyone to use this software for any purpose,
20.13 + including commercial applications, and to alter it and redistribute it
20.14 + freely, subject to the following restrictions:
20.15 +
20.16 + 1. The origin of this software must not be misrepresented; you must not
20.17 + claim that you wrote the original software. If you use this software
20.18 + in a product, an acknowledgment in the product documentation would be
20.19 + appreciated but is not required.
20.20 + 2. Altered source versions must be plainly marked as such, and must not be
20.21 + misrepresented as being the original software.
20.22 + 3. This notice may not be removed or altered from any source distribution.
20.23 +*/
20.24 +
20.25 #ifndef MIN
20.26 #define MIN(a,b) (((a) < (b)) ? (a) : (b))
20.27 #endif
21.1 --- a/src/video/SDL_video.c Thu Mar 13 00:40:08 2014 -0700
21.2 +++ b/src/video/SDL_video.c Thu Mar 13 21:21:26 2014 -0700
21.3 @@ -31,6 +31,8 @@
21.4 #include "../events/SDL_events_c.h"
21.5 #include "../timer/SDL_timer_c.h"
21.6
21.7 +#include "SDL_syswm.h"
21.8 +
21.9 #if SDL_VIDEO_OPENGL
21.10 #include "SDL_opengl.h"
21.11 #endif /* SDL_VIDEO_OPENGL */
21.12 @@ -44,8 +46,6 @@
21.13 #include "SDL_opengles2.h"
21.14 #endif /* SDL_VIDEO_OPENGL_ES2 && !SDL_VIDEO_OPENGL */
21.15
21.16 -#include "SDL_syswm.h"
21.17 -
21.18 /* On Windows, windows.h defines CreateWindow */
21.19 #ifdef CreateWindow
21.20 #undef CreateWindow
22.1 --- a/src/video/windows/SDL_msctf.h Thu Mar 13 00:40:08 2014 -0700
22.2 +++ b/src/video/windows/SDL_msctf.h Thu Mar 13 21:21:26 2014 -0700
22.3 @@ -1,3 +1,24 @@
22.4 +/*
22.5 + Simple DirectMedia Layer
22.6 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
22.7 +
22.8 + This software is provided 'as-is', without any express or implied
22.9 + warranty. In no event will the authors be held liable for any damages
22.10 + arising from the use of this software.
22.11 +
22.12 + Permission is granted to anyone to use this software for any purpose,
22.13 + including commercial applications, and to alter it and redistribute it
22.14 + freely, subject to the following restrictions:
22.15 +
22.16 + 1. The origin of this software must not be misrepresented; you must not
22.17 + claim that you wrote the original software. If you use this software
22.18 + in a product, an acknowledgment in the product documentation would be
22.19 + appreciated but is not required.
22.20 + 2. Altered source versions must be plainly marked as such, and must not be
22.21 + misrepresented as being the original software.
22.22 + 3. This notice may not be removed or altered from any source distribution.
22.23 +*/
22.24 +
22.25 #ifndef _SDL_msctf_h
22.26 #define _SDL_msctf_h
22.27
23.1 --- a/src/video/windows/wmmsg.h Thu Mar 13 00:40:08 2014 -0700
23.2 +++ b/src/video/windows/wmmsg.h Thu Mar 13 21:21:26 2014 -0700
23.3 @@ -1,3 +1,23 @@
23.4 +/*
23.5 + Simple DirectMedia Layer
23.6 + Copyright (C) 1997-2014 Sam Lantinga <slouken@libsdl.org>
23.7 +
23.8 + This software is provided 'as-is', without any express or implied
23.9 + warranty. In no event will the authors be held liable for any damages
23.10 + arising from the use of this software.
23.11 +
23.12 + Permission is granted to anyone to use this software for any purpose,
23.13 + including commercial applications, and to alter it and redistribute it
23.14 + freely, subject to the following restrictions:
23.15 +
23.16 + 1. The origin of this software must not be misrepresented; you must not
23.17 + claim that you wrote the original software. If you use this software
23.18 + in a product, an acknowledgment in the product documentation would be
23.19 + appreciated but is not required.
23.20 + 2. Altered source versions must be plainly marked as such, and must not be
23.21 + misrepresented as being the original software.
23.22 + 3. This notice may not be removed or altered from any source distribution.
23.23 +*/
23.24
23.25 #define MAX_WMMSG (sizeof(wmtab)/sizeof(wmtab[0]))
23.26