Context Navigation

← Previous Changeset
Next Changeset →

Changeset 1586Tweet

Timestamp:

Jul 6, 2012, 9:10:10 AM (11 years ago)

Author:

sam

Message:

build: update Windows SDL binaries to 1.2.15.

Location:

trunk

Files:

: 3 added
: 3 deleted
: 46 edited
: 1 moved

build/lol-build (modified) (3 diffs)
build/vs2010/Lol.Core.Vars.props (modified) (2 diffs)
contrib/NOTES (modified) (1 diff)
contrib/sdl-1.2.15 (moved) (moved from trunk/contrib/sdl-1.2.14)
contrib/sdl-1.2.15/include/SDL.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_active.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_audio.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_byteorder.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_cdrom.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_config.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_config_dreamcast.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_config_macos.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_config_macosx.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_config_minimal.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_config_nds.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_config_os2.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_config_symbian.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_config_win32.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_copying.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_cpuinfo.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_endian.h (modified) (8 diffs)
contrib/sdl-1.2.15/include/SDL_error.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_events.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_getenv.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_joystick.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_keyboard.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_keysym.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_loadso.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_main.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_mouse.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_mutex.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_opengl.h (modified) (3 diffs)
contrib/sdl-1.2.15/include/SDL_platform.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_quit.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_rwops.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_stdinc.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_syswm.h (modified) (2 diffs)
contrib/sdl-1.2.15/include/SDL_thread.h (modified) (2 diffs)
contrib/sdl-1.2.15/include/SDL_timer.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_types.h (modified) (1 diff)
contrib/sdl-1.2.15/include/SDL_version.h (modified) (2 diffs)
contrib/sdl-1.2.15/include/SDL_video.h (modified) (1 diff)
contrib/sdl-1.2.15/include/begin_code.h (modified) (3 diffs)
contrib/sdl-1.2.15/include/close_code.h (modified) (1 diff)
contrib/sdl-1.2.15/lib/i686-w64-mingw32/SDL.dll (modified) (previous)
contrib/sdl-1.2.15/lib/i686-w64-mingw32/SDL.lib (modified) (previous)
contrib/sdl-1.2.15/lib/i686-w64-mingw32/SDLmain.lib (modified) (previous)
contrib/sdl-1.2.15/lib/x86_64-w64-mingw32/SDL.dll (added)
contrib/sdl-1.2.15/lib/x86_64-w64-mingw32/SDL.lib (added)
contrib/sdl-1.2.15/lib/x86_64-w64-mingw32/SDLmain.lib (added)
contrib/sdl-1.2.15/lib/x86_64-w64-mingw32/libSDL.a (deleted)
contrib/sdl-1.2.15/lib/x86_64-w64-mingw32/libSDL.dll.a (deleted)
contrib/sdl-1.2.15/lib/x86_64-w64-mingw32/libSDLmain.a (deleted)

Legend:

: Unmodified
: Added
: Removed

trunk/build/lol-build

-                      r1528
+                      r1586
             PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/libcaca-0.99.beta18/lib/pkgconfig"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/i686-w64-mingw32"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/i686-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.15/lib/i686-w64-mingw32"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/i686-w64-mingw32"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/i686-w64-mingw32"
 …
             PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/libcaca-0.99.beta18/lib/pkgconfig"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/x86_64-w64-mingw32"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/x86_64-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.15/lib/x86_64-w64-mingw32"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/x86_64-w64-mingw32"
             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/x86_64-w64-mingw32"
 …
             ;;
         win*-i386|win*-amd64)
             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.14/include"
+            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.15/include"
             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include"
             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-mixer-1.2.11/include"

trunk/build/vs2010/Lol.Core.Vars.props

-                      r1583
+                      r1586
     <!-- SDL -->
     <SdlDir>$(ContribDir)\sdl-1.2.14</SdlDir>
+    <SdlDir>$(ContribDir)\sdl-1.2.15</SdlDir>
     <SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir>
     <SdlMixerDir>$(ContribDir)\sdl-mixer-1.2.11</SdlMixerDir>
 …
     <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-w64-mingw32</SdlLibs>
     <SdlDeps Condition="'$(Platform)'=='Win32'">SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
     <SdlDeps Condition="'$(Platform)'=='x64'">libSDL.a;libSDLmain.a;winmm.lib;dxguid.lib</SdlDeps>
+    <SdlDeps Condition="'$(Platform)'=='x64'">SDL.lib;SDLmain.lib</SdlDeps>
     <Win32Defines>HAVE_SDL_H;USE_SDL;$(Win32Defines)</Win32Defines>

trunk/contrib/NOTES

-                      r1583
+                      r1586
 Download page: http://www.libsdl.org/release/
+Win32:
+- just take the pre-compiled binaries from upstream
+Win64:
+- ./configure --host=x86_64-w64-mingw32 CPPFLAGS=-D_CRTIMP=
+- deactivate NONAMELESSUNION in src/video/windx5/directx.h
+- make -j6
+- copy build/.libs/libSDLmain.a
+- copy build/.libs/libSDL.a
+- copy build/.libs/libSDL.dll.a
+Just take the pre-compiled binaries from upstream (for VC). For other
+ways to build SDL, see older versions of this document.

trunk/contrib/sdl-1.2.15/include/SDL.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_active.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_audio.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_byteorder.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_cdrom.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_config.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_config_dreamcast.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_config_macos.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_config_macosx.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_config_minimal.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_config_nds.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_config_os2.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_config_symbian.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_config_win32.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_copying.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_cpuinfo.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_endian.h

-                      r613
+                      r1586
 /*
     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
 …
 #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) || \
 …
 #define SDL_BYTEORDER   SDL_LIL_ENDIAN
 #endif
+#endif /* __linux __ */
 #endif /* !SDL_BYTEORDER */
 …
 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;
+}
 #elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
+        return (Uint16)result;
+}
+#elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__))
 static __inline__ Uint16 SDL_Swap16(Uint16 x)
+{
 …
 #else
 static __inline__ Uint16 SDL_Swap16(Uint16 x) {
         return((x<<8)|(x>>8));
+        return SDL_static_cast(Uint16, ((x<<8)|(x>>8)));
+}
 #endif
 …
         return result;
+}
 #elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
+#elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__))
 static __inline__ Uint32 SDL_Swap32(Uint32 x)
+{
 …
 #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
 …
         x <<= 32;
         x |= SDL_Swap32(hi);
         return(x);
+        return (x);
+}
 #endif

trunk/contrib/sdl-1.2.15/include/SDL_error.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_events.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_getenv.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_joystick.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_keyboard.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_keysym.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_loadso.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_main.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_mouse.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_mutex.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_opengl.h

-                      r613
+                      r1586
 /*
     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
 …
 #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
 …
 /* 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

trunk/contrib/sdl-1.2.15/include/SDL_platform.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_quit.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_rwops.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_stdinc.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_syswm.h

-                      r613
+                      r1586
 /*
     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
 …
  * 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) ) { ... }

trunk/contrib/sdl-1.2.15/include/SDL_thread.h

-                      r613
+                      r1586
 /*
     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
 …
 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,

trunk/contrib/sdl-1.2.15/include/SDL_timer.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_types.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/SDL_version.h

-                      r613
+                      r1586
 /*
     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
 …
 #define SDL_MAJOR_VERSION       1
 #define SDL_MINOR_VERSION       2
 #define SDL_PATCHLEVEL          14
+#define SDL_PATCHLEVEL          15
 /*@}*/

trunk/contrib/sdl-1.2.15/include/SDL_video.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

trunk/contrib/sdl-1.2.15/include/begin_code.h

-                      r613
+                      r1586
 /*
     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
 …
 # if defined(__BEOS__) || defined(__HAIKU__)
 #  if defined(__GNUC__)
 #   define DECLSPEC     __declspec(dllexport)
+#   define DECLSPEC
 #  else
 #   define DECLSPEC     __declspec(export)
 …
 #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

trunk/contrib/sdl-1.2.15/include/close_code.h

r613	r1586
1	1	/*
2	2	SDL - Simple DirectMedia Layer
3		Copyright (C) 1997-2009 Sam Lantinga
	3	Copyright (C) 1997-2012 Sam Lantinga
4	4
5	5	This library is free software; you can redistribute it and/or

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 1586Tweet

Legend:

Download in other formats: