Changeset 1156Tweet

Timestamp:

Mar 10, 2012, 3:04:11 AM (11 years ago)

Author:

sam

Message:

win32: no longer ship GDI+ because MinGW ships a working version, including
for Win64.

Location:

trunk

Files:

• build/lol-build (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• contrib/gdiplus (deleted)
• src/image/codec/gdiplus-image.cpp (modified) (1 diff)

trunk/build/lol-build

@@ -83 +83 @@
             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"
@@ -131 +130 @@
             ;;
         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"

trunk/configure.ac

@@ -285 +285 @@
 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"],

trunk/src/image/codec/gdiplus-image.cpp

@@ -22 +22 @@
 
 #include <windows.h>
-#include <Gdiplus.h>
+#include <gdiplus.h>
 
 #include "core.h"