Changeset 2399 for trunk


Ignore:
Timestamp:
Feb 12, 2013, 5:57:53 PM (7 years ago)
Author:
sam
Message:

external: update SDL_image and SDL_mixer to 1.2.12 and add Win64 versions.

Location:
trunk
Files:
40 added
13 deleted
2 edited
2 moved

Legend:

Unmodified
Added
Removed
  • trunk/build/lol-build

    r2292 r2399  
    138138            LDFLAGS="$LDFLAGS -L$PWD/external/glew-1.9.0/lib/i686-w64-mingw32"
    139139            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-1.2.15/lib/i686-w64-mingw32"
    140             LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.10/lib/i686-w64-mingw32"
    141             LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.11/lib/i686-w64-mingw32"
     140            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.12/lib/i686-w64-mingw32"
     141            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.12/lib/i686-w64-mingw32"
    142142            LDFLAGS="$LDFLAGS -L$PWD/external/gtk-2.22.1/lib"
    143143            LDFLAGS="$LDFLAGS -L$PWD/external/gtk-2.22.1/bin"
     
    163163            LDFLAGS="$LDFLAGS -L$PWD/external/glew-1.9.0/lib/x86_64-w64-mingw32"
    164164            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-1.2.15/lib/x86_64-w64-mingw32"
    165             LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.10/lib/x86_64-w64-mingw32"
    166             LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.11/lib/x86_64-w64-mingw32"
     165            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.12/lib/x86_64-msvc"
     166            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.12/lib/x86_64-msvc"
    167167            LDFLAGS="$LDFLAGS -L$PWD/external/libcaca-0.99.beta18/lib/x86_64-w64-mingw32"
    168168            ;;
     
    205205        win*-i386|win*-amd64)
    206206            CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-1.2.15/include"
    207             CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-image-1.2.10/include"
    208             CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-mixer-1.2.11/include"
     207            CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-image-1.2.12/include"
     208            CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-mixer-1.2.12/include"
    209209            CPPFLAGS="$CPPFLAGS -I$PWD/external/glew-1.9.0/include/GL -DGLEW_STATIC"
    210210            CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/lib/glib-2.0/include"
  • trunk/build/vs2010/Lol.Core.Vars.props

    r2398 r2399  
    1111    <!-- SDL -->
    1212    <SdlDir>$(ExternalDir)\sdl-1.2.15</SdlDir>
    13     <SdlImageDir>$(ExternalDir)\sdl-image-1.2.10</SdlImageDir>
    14     <SdlMixerDir>$(ExternalDir)\sdl-mixer-1.2.11</SdlMixerDir>
     13    <SdlImageDir>$(ExternalDir)\sdl-image-1.2.12</SdlImageDir>
     14    <SdlMixerDir>$(ExternalDir)\sdl-mixer-1.2.12</SdlMixerDir>
    1515    <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
    1616    <SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32</SdlLibs>
    17     <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-msvc</SdlLibs>
     17    <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-msvc;$(SdlImageDir)\lib\x86_64-msvc;$(SdlMixerDir)\lib\x86_64-msvc</SdlLibs>
    1818    <SdlDeps Condition="'$(Platform)'=='Win32'">SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
    19     <SdlDeps Condition="'$(Platform)'=='x64'">SDL.lib;SDLmain.lib</SdlDeps>
     19    <SdlDeps Condition="'$(Platform)'=='x64'">SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
    2020    <Win32Defines>HAVE_SDL_H;USE_SDL;$(Win32Defines)</Win32Defines>
    21     <Win32Defines Condition="'$(Platform)'=='Win32'">USE_SDL_MIXER;USE_SDL_IMAGE;$(Win32Defines)</Win32Defines>
     21    <Win32Defines>USE_SDL_MIXER;USE_SDL_IMAGE;$(Win32Defines)</Win32Defines>
    2222
    2323    <!-- BulletPhysics -->
  • trunk/external/sdl-image-1.2.12/include/SDL_image.h

    r2398 r2399  
    11/*
    2     SDL_image:  An example image loading library for use with SDL
    3     Copyright (C) 1997-2009 Sam Lantinga
     2  SDL_image:  An example image loading library for use with SDL
     3  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
    44
    5     This library is free software; you can redistribute it and/or
    6     modify it under the terms of the GNU Lesser General Public
    7     License as published by the Free Software Foundation; either
    8     version 2.1 of the License, or (at your option) any later version.
     5  This software is provided 'as-is', without any express or implied
     6  warranty.  In no event will the authors be held liable for any damages
     7  arising from the use of this software.
    98
    10     This library is distributed in the hope that it will be useful,
    11     but WITHOUT ANY WARRANTY; without even the implied warranty of
    12     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    13     Lesser General Public License for more details.
     9  Permission is granted to anyone to use this software for any purpose,
     10  including commercial applications, and to alter it and redistribute it
     11  freely, subject to the following restrictions:
    1412
    15     You should have received a copy of the GNU Lesser General Public
    16     License along with this library; if not, write to the Free Software
    17     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    18 
    19     Sam Lantinga
    20     slouken@libsdl.org
     13  1. The origin of this software must not be misrepresented; you must not
     14     claim that you wrote the original software. If you use this software
     15     in a product, an acknowledgment in the product documentation would be
     16     appreciated but is not required.
     17  2. Altered source versions must be plainly marked as such, and must not be
     18     misrepresented as being the original software.
     19  3. This notice may not be removed or altered from any source distribution.
    2120*/
    2221
     
    3938#define SDL_IMAGE_MAJOR_VERSION 1
    4039#define SDL_IMAGE_MINOR_VERSION 2
    41 #define SDL_IMAGE_PATCHLEVEL    10
     40#define SDL_IMAGE_PATCHLEVEL    11
    4241
    4342/* This macro can be used to fill a version structure with the compile-time
     
    6160    IMG_INIT_JPG = 0x00000001,
    6261    IMG_INIT_PNG = 0x00000002,
    63     IMG_INIT_TIF = 0x00000004
     62    IMG_INIT_TIF = 0x00000004,
     63    IMG_INIT_WEBP = 0x00000008
    6464} IMG_InitFlags;
    6565
     
    105105extern DECLSPEC int SDLCALL IMG_isXPM(SDL_RWops *src);
    106106extern DECLSPEC int SDLCALL IMG_isXV(SDL_RWops *src);
     107extern DECLSPEC int SDLCALL IMG_isWEBP(SDL_RWops *src);
    107108
    108109/* Individual loading functions */
     
    121122extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadXPM_RW(SDL_RWops *src);
    122123extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadXV_RW(SDL_RWops *src);
     124extern DECLSPEC SDL_Surface * SDLCALL IMG_LoadWEBP_RW(SDL_RWops *src);
    123125
    124126extern DECLSPEC SDL_Surface * SDLCALL IMG_ReadXPMFromArray(char **xpm);
  • trunk/external/sdl-mixer-1.2.12/include/SDL_mixer.h

    r2398 r2399  
    11/*
    2     SDL_mixer:  An audio mixer library based on the SDL library
    3     Copyright (C) 1997-2009 Sam Lantinga
    4 
    5     This library is free software; you can redistribute it and/or
    6     modify it under the terms of the GNU Library General Public
    7     License as published by the Free Software Foundation; either
    8     version 2 of the License, or (at your option) any later version.
    9 
    10     This library is distributed in the hope that it will be useful,
    11     but WITHOUT ANY WARRANTY; without even the implied warranty of
    12     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
    13     Library General Public License for more details.
    14 
    15     You should have received a copy of the GNU Library General Public
    16     License along with this library; if not, write to the Free
    17     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
    18 
    19     Sam Lantinga
    20     slouken@libsdl.org
    21 */
    22 
    23 /* $Id: SDL_mixer.h 5252 2009-11-15 09:41:26Z slouken $ */
     2  SDL_mixer:  An audio mixer library based on the SDL library
     3  Copyright (C) 1997-2012 Sam Lantinga <slouken@libsdl.org>
     4
     5  This software is provided 'as-is', without any express or implied
     6  warranty.  In no event will the authors be held liable for any damages
     7  arising from the use of this software.
     8
     9  Permission is granted to anyone to use this software for any purpose,
     10  including commercial applications, and to alter it and redistribute it
     11  freely, subject to the following restrictions:
     12
     13  1. The origin of this software must not be misrepresented; you must not
     14     claim that you wrote the original software. If you use this software
     15     in a product, an acknowledgment in the product documentation would be
     16     appreciated but is not required.
     17  2. Altered source versions must be plainly marked as such, and must not be
     18     misrepresented as being the original software.
     19  3. This notice may not be removed or altered from any source distribution.
     20*/
     21
     22/* $Id$ */
    2423
    2524#ifndef _SDL_MIXER_H
     
    4241#define SDL_MIXER_MAJOR_VERSION 1
    4342#define SDL_MIXER_MINOR_VERSION 2
    44 #define SDL_MIXER_PATCHLEVEL    11
     43#define SDL_MIXER_PATCHLEVEL    12
    4544
    4645/* This macro can be used to fill a version structure with the compile-time
     
    6867typedef enum
    6968{
    70     MIX_INIT_FLAC = 0x00000001,
    71     MIX_INIT_MOD  = 0x00000002,
    72     MIX_INIT_MP3  = 0x00000004,
    73     MIX_INIT_OGG  = 0x00000008
     69    MIX_INIT_FLAC        = 0x00000001,
     70    MIX_INIT_MOD         = 0x00000002,
     71    MIX_INIT_MP3         = 0x00000004,
     72    MIX_INIT_OGG         = 0x00000008,
     73    MIX_INIT_FLUIDSYNTH  = 0x00000010
    7474} MIX_InitFlags;
    7575
     
    123123        MUS_MP3,
    124124        MUS_MP3_MAD,
    125         MUS_FLAC
     125        MUS_FLAC,
     126        MUS_MODPLUG
    126127} Mix_MusicType;
    127128
     
    153154   Matt Campbell (matt@campbellhome.dhs.org) April 2000 */
    154155extern DECLSPEC Mix_Music * SDLCALL Mix_LoadMUS_RW(SDL_RWops *rw);
     156
     157/* Load a music file from an SDL_RWop object assuming a specific format */
     158extern DECLSPEC Mix_Music * SDLCALL Mix_LoadMUSType_RW(SDL_RWops *rw, Mix_MusicType type, int freesrc);
    155159
    156160/* Load a wave file of the mixer format from a memory buffer */
     
    587591   This returns 0 if successful, or -1 if it failed or isn't implemented.
    588592   This function is only implemented for MOD music formats (set pattern
    589    order number) and for OGG music (set position in seconds), at the
    590    moment.
     593   order number) and for OGG, FLAC, MP3_MAD, and MODPLUG music (set
     594   position in seconds), at the moment.
    591595*/
    592596extern DECLSPEC int SDLCALL Mix_SetMusicPosition(double position);
     
    604608extern DECLSPEC int SDLCALL Mix_SetSynchroValue(int value);
    605609extern DECLSPEC int SDLCALL Mix_GetSynchroValue(void);
     610
     611/* Set/Get/Iterate SoundFonts paths to use by supported MIDI backends */
     612extern DECLSPEC int SDLCALL Mix_SetSoundFonts(const char *paths);
     613extern DECLSPEC const char* SDLCALL Mix_GetSoundFonts(void);
     614extern DECLSPEC int SDLCALL Mix_EachSoundFont(int (*function)(const char*, void*), void *data);
    606615
    607616/* Get the Mix_Chunk currently associated with a mixer channel
Note: See TracChangeset for help on using the changeset viewer.