diff --git a/build/lol-build b/build/lol-build
index 8beb6089..669d728b 100755
--- a/build/lol-build
+++ b/build/lol-build
@@ -137,8 +137,8 @@ configure()
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/libcaca-0.99.beta18/lib/pkgconfig"
LDFLAGS="$LDFLAGS -L$PWD/external/glew-1.9.0/lib/i686-w64-mingw32"
LDFLAGS="$LDFLAGS -L$PWD/external/sdl-1.2.15/lib/i686-w64-mingw32"
- LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.10/lib/i686-w64-mingw32"
- LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.11/lib/i686-w64-mingw32"
+ LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.12/lib/i686-w64-mingw32"
+ LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.12/lib/i686-w64-mingw32"
LDFLAGS="$LDFLAGS -L$PWD/external/gtk-2.22.1/lib"
LDFLAGS="$LDFLAGS -L$PWD/external/gtk-2.22.1/bin"
LDFLAGS="$LDFLAGS -L$PWD/external/gtkglarea-2.0.1/lib"
@@ -162,8 +162,8 @@ configure()
PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/external/libcaca-0.99.beta18/lib/pkgconfig"
LDFLAGS="$LDFLAGS -L$PWD/external/glew-1.9.0/lib/x86_64-w64-mingw32"
LDFLAGS="$LDFLAGS -L$PWD/external/sdl-1.2.15/lib/x86_64-w64-mingw32"
- LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.10/lib/x86_64-w64-mingw32"
- LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.11/lib/x86_64-w64-mingw32"
+ LDFLAGS="$LDFLAGS -L$PWD/external/sdl-image-1.2.12/lib/x86_64-msvc"
+ LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-1.2.12/lib/x86_64-msvc"
LDFLAGS="$LDFLAGS -L$PWD/external/libcaca-0.99.beta18/lib/x86_64-w64-mingw32"
;;
*-i386)
@@ -204,8 +204,8 @@ configure()
;;
win*-i386|win*-amd64)
CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-1.2.15/include"
- CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-image-1.2.10/include"
- CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-mixer-1.2.11/include"
+ CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-image-1.2.12/include"
+ CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-mixer-1.2.12/include"
CPPFLAGS="$CPPFLAGS -I$PWD/external/glew-1.9.0/include/GL -DGLEW_STATIC"
CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/lib/glib-2.0/include"
CPPFLAGS="$CPPFLAGS -I$PWD/external/gtk-2.22.1/lib/gtk-2.0/include"
diff --git a/build/vs2010/Lol.Core.Vars.props b/build/vs2010/Lol.Core.Vars.props
index b7d68a16..9e655b35 100644
--- a/build/vs2010/Lol.Core.Vars.props
+++ b/build/vs2010/Lol.Core.Vars.props
@@ -10,15 +10,15 @@
$(ExternalDir)\sdl-1.2.15
- $(ExternalDir)\sdl-image-1.2.10
- $(ExternalDir)\sdl-mixer-1.2.11
+ $(ExternalDir)\sdl-image-1.2.12
+ $(ExternalDir)\sdl-mixer-1.2.12
$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include
$(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32
- $(SdlDir)\lib\x86_64-msvc
+ $(SdlDir)\lib\x86_64-msvc;$(SdlImageDir)\lib\x86_64-msvc;$(SdlMixerDir)\lib\x86_64-msvc
SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib
- SDL.lib;SDLmain.lib
+ SDL.lib;SDLmain.lib;SDL_image.lib;SDL_mixer.lib
HAVE_SDL_H;USE_SDL;$(Win32Defines)
- USE_SDL_MIXER;USE_SDL_IMAGE;$(Win32Defines)
+ USE_SDL_MIXER;USE_SDL_IMAGE;$(Win32Defines)
$(ExternalDir)\bullet-2.80-rev2531