From 06d9d00c34ce5f13dac99e6206f0d2a29347c927 Mon Sep 17 00:00:00 2001
From: Sam Hocevar <sam@hocevar.net>
Date: Sat, 10 Mar 2012 02:04:11 +0000
Subject: [PATCH] win32: no longer ship GDI+ because MinGW ships a working
 version, including for Win64.

---
 build/lol-build                   | 2 --
 configure.ac                      | 2 +-
 src/image/codec/gdiplus-image.cpp | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/build/lol-build b/build/lol-build
index 41a56839..400c6494 100755
--- a/build/lol-build
+++ b/build/lol-build
@@ -82,7 +82,6 @@ configure()
                 BUILDFLAGS=
             fi
             PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"
-            LDFLAGS="$LDFLAGS -L$PWD/contrib/gdiplus/lib"
             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-image-1.2.10/lib/i686-w64-mingw32"
@@ -130,7 +129,6 @@ configure()
             PATH="$PATH" ./configure CXX=ppu-lv2-g++ CC=ppu-lv2-gcc ac_cv_exeext=.elf --host=powerpc
             ;;
         windows-i386|windows-amd64)
-            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gdiplus/include"
             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.14/include"
             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include"
             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-mixer-1.2.11/include"
diff --git a/configure.ac b/configure.ac
index 21ec8af4..92363970 100644
--- a/configure.ac
+++ b/configure.ac
@@ -284,7 +284,7 @@ AM_CONDITIONAL(USE_LIBPNG, test "${ac_cv_my_have_libpng}" != "no")
 dnl Use Windows GDI+?
 ac_cv_my_have_gdiplus="no"
 AC_LANG_PUSH(C++)
-AC_CHECK_HEADERS(Gdiplus.h,
+AC_CHECK_HEADERS(gdiplus.h,
  [ac_cv_my_have_gdiplus="yes"
   LOL_LIBS="${LOL_LIBS} -lgdiplus"],
  [ac_cv_my_have_gdiplus="no"],
diff --git a/src/image/codec/gdiplus-image.cpp b/src/image/codec/gdiplus-image.cpp
index 4b23d78e..0182e579 100644
--- a/src/image/codec/gdiplus-image.cpp
+++ b/src/image/codec/gdiplus-image.cpp
@@ -21,7 +21,7 @@
 using namespace std;
 
 #include <windows.h>
-#include <Gdiplus.h>
+#include <gdiplus.h>
 
 #include "core.h"
 #include "../../image/image-private.h"