Changeset 1156


Ignore:
Timestamp:
Mar 10, 2012, 3:04:11 AM (8 years ago)
Author:
sam
Message:

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

Location:
trunk
Files:
1 deleted
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/build/lol-build

    r1103 r1156  
    8383            fi
    8484            PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PWD/contrib/gtkglarea-2.0.1/lib/pkgconfig"
    85             LDFLAGS="$LDFLAGS -L$PWD/contrib/gdiplus/lib"
    8685            LDFLAGS="$LDFLAGS -L$PWD/contrib/glew-1.7.0/lib/i686-w64-mingw32"
    8786            LDFLAGS="$LDFLAGS -L$PWD/contrib/sdl-1.2.14/lib/i686-w64-mingw32"
     
    131130            ;;
    132131        windows-i386|windows-amd64)
    133             CPPFLAGS="$CPPFLAGS -I$PWD/contrib/gdiplus/include"
    134132            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-1.2.14/include"
    135133            CPPFLAGS="$CPPFLAGS -I$PWD/contrib/sdl-image-1.2.10/include"
  • trunk/configure.ac

    r1129 r1156  
    285285ac_cv_my_have_gdiplus="no"
    286286AC_LANG_PUSH(C++)
    287 AC_CHECK_HEADERS(Gdiplus.h,
     287AC_CHECK_HEADERS(gdiplus.h,
    288288 [ac_cv_my_have_gdiplus="yes"
    289289  LOL_LIBS="${LOL_LIBS} -lgdiplus"],
  • trunk/src/image/codec/gdiplus-image.cpp

    r981 r1156  
    2222
    2323#include <windows.h>
    24 #include <Gdiplus.h>
     24#include <gdiplus.h>
    2525
    2626#include "core.h"
Note: See TracChangeset for help on using the changeset viewer.