Changeset 1586


Ignore:
Timestamp:
Jul 6, 2012, 9:10:10 AM (8 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

Legend:

Unmodified
Added
Removed
  • trunk/build/lol-build

    r1528 r1586  
    8585            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/libcaca-0.99.beta18/lib/pkgconfig"
    8686            LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/i686-w64-mingw32"
    87             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/i686-w64-mingw32"
     87            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.15/lib/i686-w64-mingw32"
    8888            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/i686-w64-mingw32"
    8989            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/i686-w64-mingw32"
     
    110110            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/libcaca-0.99.beta18/lib/pkgconfig"
    111111            LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/x86_64-w64-mingw32"
    112             LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/x86_64-w64-mingw32"
     112            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.15/lib/x86_64-w64-mingw32"
    113113            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-image-1.2.10/lib/x86_64-w64-mingw32"
    114114            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-mixer-1.2.11/lib/x86_64-w64-mingw32"
     
    142142            ;;
    143143        win*-i386|win*-amd64)
    144             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.14/include"
     144            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.15/include"
    145145            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include"
    146146            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-mixer-1.2.11/include"
  • trunk/build/vs2010/Lol.Core.Vars.props

    r1583 r1586  
    1010
    1111    <!-- SDL -->
    12     <SdlDir>$(ContribDir)\sdl-1.2.14</SdlDir>
     12    <SdlDir>$(ContribDir)\sdl-1.2.15</SdlDir>
    1313    <SdlImageDir>$(ContribDir)\sdl-image-1.2.10</SdlImageDir>
    1414    <SdlMixerDir>$(ContribDir)\sdl-mixer-1.2.11</SdlMixerDir>
     
    1717    <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-w64-mingw32</SdlLibs>
    1818    <SdlDeps Condition="'$(Platform)'=='Win32'">SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
    19     <SdlDeps Condition="'$(Platform)'=='x64'">libSDL.a;libSDLmain.a;winmm.lib;dxguid.lib</SdlDeps>
     19    <SdlDeps Condition="'$(Platform)'=='x64'">SDL.lib;SDLmain.lib</SdlDeps>
    2020    <Win32Defines>HAVE_SDL_H;USE_SDL;$(Win32Defines)</Win32Defines>
    2121
  • trunk/contrib/NOTES

    r1583 r1586  
    3939Download page: http://www.libsdl.org/release/
    4040
    41 Win32:
    42 - just take the pre-compiled binaries from upstream
    43 
    44 Win64:
    45 - ./configure --host=x86_64-w64-mingw32 CPPFLAGS=-D_CRTIMP=
    46 - deactivate NONAMELESSUNION in src/video/windx5/directx.h
    47 - make -j6
    48 - copy build/.libs/libSDLmain.a
    49 - copy build/.libs/libSDL.a
    50 - copy build/.libs/libSDL.dll.a
     41Just take the pre-compiled binaries from upstream (for VC). For other
     42ways to build SDL, see older versions of this document.
    5143
    5244
  • trunk/contrib/sdl-1.2.15/include/SDL.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_active.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_audio.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_byteorder.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_cdrom.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_config.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_config_dreamcast.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_config_macos.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_config_macosx.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_config_minimal.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_config_nds.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_config_os2.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_config_symbian.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_config_win32.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_copying.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_cpuinfo.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_endian.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
     
    4040
    4141#ifndef SDL_BYTEORDER   /* Not defined in SDL_config.h? */
     42#ifdef __linux__
     43#include <endian.h>
     44#define SDL_BYTEORDER  __BYTE_ORDER
     45#else /* __linux __ */
    4246#if defined(__hppa__) || \
    4347    defined(__m68k__) || defined(mc68000) || defined(_M_M68K) || \
     
    4953#define SDL_BYTEORDER   SDL_LIL_ENDIAN
    5054#endif
     55#endif /* __linux __ */
    5156#endif /* !SDL_BYTEORDER */
    5257
     
    8287static __inline__ Uint16 SDL_Swap16(Uint16 x)
    8388{
    84         Uint16 result;
     89        int result;
    8590
    8691        __asm__("rlwimi %0,%2,8,16,23" : "=&r" (result) : "0" (x >> 8), "r" (x));
    87         return result;
    88 }
    89 #elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
     92        return (Uint16)result;
     93}
     94#elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__))
    9095static __inline__ Uint16 SDL_Swap16(Uint16 x)
    9196{
     
    95100#else
    96101static __inline__ Uint16 SDL_Swap16(Uint16 x) {
    97         return((x<<8)|(x>>8));
     102        return SDL_static_cast(Uint16, ((x<<8)|(x>>8)));
    98103}
    99104#endif
     
    122127        return result;
    123128}
    124 #elif defined(__GNUC__) && (defined(__M68000__) || defined(__M68020__))
     129#elif defined(__GNUC__) && (defined(__m68k__) && !defined(__mcoldfire__))
    125130static __inline__ Uint32 SDL_Swap32(Uint32 x)
    126131{
     
    130135#else
    131136static __inline__ Uint32 SDL_Swap32(Uint32 x) {
    132         return((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24));
     137        return SDL_static_cast(Uint32, ((x<<24)|((x<<8)&0x00FF0000)|((x>>8)&0x0000FF00)|(x>>24)));
    133138}
    134139#endif
     
    167172        x <<= 32;
    168173        x |= SDL_Swap32(hi);
    169         return(x);
     174        return (x);
    170175}
    171176#endif
  • trunk/contrib/sdl-1.2.15/include/SDL_error.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_events.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_getenv.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_joystick.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_keyboard.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_keysym.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_loadso.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_main.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_mouse.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_mutex.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_opengl.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
     
    31093109#ifndef GL_VERSION_1_5
    31103110/* GL types for handling large vertex buffer objects */
     3111#ifdef __APPLE__
     3112typedef long GLintptr;
     3113typedef long GLsizeiptr;
     3114#else
    31113115typedef ptrdiff_t GLintptr;
    31123116typedef ptrdiff_t GLsizeiptr;
    31133117#endif
     3118#endif
    31143119
    31153120#ifndef GL_ARB_vertex_buffer_object
    31163121/* GL types for handling large vertex buffer objects */
     3122#ifdef __APPLE__
     3123typedef long GLintptrARB;
     3124typedef long GLsizeiptrARB;
     3125#else
    31173126typedef ptrdiff_t GLintptrARB;
    31183127typedef ptrdiff_t GLsizeiptrARB;
     3128#endif
    31193129#endif
    31203130
     
    31223132/* GL types for handling shader object handles and program/shader text */
    31233133typedef char GLcharARB;         /* native character */
     3134#if defined(__APPLE__)
     3135typedef void *GLhandleARB;      /* shader object handle */
     3136#else
    31243137typedef unsigned int GLhandleARB;       /* shader object handle */
     3138#endif
    31253139#endif
    31263140
  • trunk/contrib/sdl-1.2.15/include/SDL_platform.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_quit.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_rwops.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_stdinc.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_syswm.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
     
    204204 * This function gives you custom hooks into the window manager information.
    205205 * It fills the structure pointed to by 'info' with custom information and
    206  * returns 1 if the function is implemented.  If it's not implemented, or
    207  * the version member of the 'info' structure is invalid, it returns 0.
     206 * returns 0 if the function is not implemented, 1 if the function is
     207 * implemented and no error occurred, and -1 if the version member of
     208 * the 'info' structure is not filled in or not supported.
    208209 *
    209210 * You typically use this function like this:
    210211 * @code
    211  * SDL_SysWMInfo info;
     212 * SDL_SysWMinfo info;
    212213 * SDL_VERSION(&info.version);
    213214 * if ( SDL_GetWMInfo(&info) ) { ... }
  • trunk/contrib/sdl-1.2.15/include/SDL_thread.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
     
    6969typedef int (*pfnSDL_CurrentBeginThread)(void (*func)(void *), void *, unsigned, void *arg);
    7070typedef void (*pfnSDL_CurrentEndThread)(void);
    71 #elif __GNUC__
    72 typedef unsigned long (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
    73         unsigned (__stdcall *func)(void *), void *arg,
    74         unsigned, unsigned *threadID);
    75 typedef void (__cdecl *pfnSDL_CurrentEndThread)(unsigned code);
    7671#else
    7772typedef uintptr_t (__cdecl *pfnSDL_CurrentBeginThread) (void *, unsigned,
  • trunk/contrib/sdl-1.2.15/include/SDL_timer.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_types.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/SDL_version.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
     
    4242#define SDL_MAJOR_VERSION       1
    4343#define SDL_MINOR_VERSION       2
    44 #define SDL_PATCHLEVEL          14
     44#define SDL_PATCHLEVEL          15
    4545/*@}*/
    4646
  • trunk/contrib/sdl-1.2.15/include/SDL_video.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
  • trunk/contrib/sdl-1.2.15/include/begin_code.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
     
    4444# if defined(__BEOS__) || defined(__HAIKU__)
    4545#  if defined(__GNUC__)
    46 #   define DECLSPEC     __declspec(dllexport)
     46#   define DECLSPEC
    4747#  else
    4848#   define DECLSPEC     __declspec(export)
     
    133133#pragma nopackwarning
    134134#endif
     135#ifdef _M_X64
     136/* Use 8-byte alignment on 64-bit architectures, so pointers are aligned */
     137#pragma pack(push,8)
     138#else
    135139#pragma pack(push,4)
     140#endif
    136141#elif (defined(__MWERKS__) && defined(__MACOS__))
    137142#pragma options align=mac68k4byte
  • trunk/contrib/sdl-1.2.15/include/close_code.h

    r613 r1586  
    11/*
    22    SDL - Simple DirectMedia Layer
    3     Copyright (C) 1997-2009 Sam Lantinga
     3    Copyright (C) 1997-2012 Sam Lantinga
    44
    55    This library is free software; you can redistribute it and/or
Note: See TracChangeset for help on using the changeset viewer.