From a9b4281b478042dba8536cc428e826581e2c2750 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Mon, 8 Sep 2014 17:00:57 +0000
Subject: [PATCH] build: update our Win32 SDL_image and SDL_mixer.

---
 build/lol-build                        | 12 ++++++------
 build/visualstudio/Lol.Core.Vars.props |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/build/lol-build b/build/lol-build
index 24c6df0e..2f290b9b 100755
--- a/build/lol-build
+++ b/build/lol-build
@@ -169,8 +169,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-2.0.3/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/sdl-image-2.0.0/lib/i686-w64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-2.0.0/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"
@@ -194,8 +194,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-2.0.3/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/sdl-image-2.0.0/lib/x86_64-mingw32"
+            LDFLAGS="$LDFLAGS -L$PWD/external/sdl-mixer-2.0.0/lib/x86_64-mingw32"
             LDFLAGS="$LDFLAGS -L$PWD/external/libcaca-0.99.beta18/lib/x86_64-w64-mingw32"
             ;;
         *-i386)
@@ -252,8 +252,8 @@ configure()
             ;;
         win*-i386|win*-amd64)
             CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-2.0.3/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/sdl-image-2.0.0/include"
+            CPPFLAGS="$CPPFLAGS -I$PWD/external/sdl-mixer-2.0.0/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/visualstudio/Lol.Core.Vars.props b/build/visualstudio/Lol.Core.Vars.props
index 5555c367..5b9cc3bd 100644
--- a/build/visualstudio/Lol.Core.Vars.props
+++ b/build/visualstudio/Lol.Core.Vars.props
@@ -10,10 +10,10 @@
 
     <!-- SDL -->
     <SdlDir>$(ExternalDir)\sdl-2.0.3</SdlDir>
-    <SdlImageDir>$(ExternalDir)\sdl-image-1.2.12</SdlImageDir>
-    <SdlMixerDir>$(ExternalDir)\sdl-mixer-1.2.12</SdlMixerDir>
+    <SdlImageDir>$(ExternalDir)\sdl-image-2.0.0</SdlImageDir>
+    <SdlMixerDir>$(ExternalDir)\sdl-mixer-2.0.0</SdlMixerDir>
     <SdlIncludes>$(SdlDir)\include;$(SdlImageDir)\include;$(SdlMixerDir)\include</SdlIncludes>
-    <SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-w64-mingw32;$(SdlImageDir)\lib\i686-w64-mingw32;$(SdlMixerDir)\lib\i686-w64-mingw32</SdlLibs>
+    <SdlLibs Condition="'$(Platform)'=='Win32'">$(SdlDir)\lib\i686-w64-msvc;$(SdlImageDir)\lib\i686-w64-msvc;$(SdlMixerDir)\lib\i686-w64-msvc</SdlLibs>
     <SdlLibs Condition="'$(Platform)'=='x64'">$(SdlDir)\lib\x86_64-msvc;$(SdlImageDir)\lib\x86_64-msvc;$(SdlMixerDir)\lib\x86_64-msvc</SdlLibs>
     <SdlDeps Condition="'$(Platform)'=='Win32'">SDL2.lib;SDL2main.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>
     <SdlDeps Condition="'$(Platform)'=='x64'">SDL2.lib;SDL2main.lib;SDL_image.lib;SDL_mixer.lib</SdlDeps>