Selaa lähdekoodia

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

for Win64.
legacy
Sam Hocevar sam 12 vuotta sitten
vanhempi
commit
06d9d00c34
3 muutettua tiedostoa jossa 2 lisäystä ja 4 poistoa
  1. +0
    -2
      build/lol-build
  2. +1
    -1
      configure.ac
  3. +1
    -1
      src/image/codec/gdiplus-image.cpp

+ 0
- 2
build/lol-build Näytä tiedosto

@@ -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"


+ 1
- 1
configure.ac Näytä tiedosto

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


+ 1
- 1
src/image/codec/gdiplus-image.cpp Näytä tiedosto

@@ -21,7 +21,7 @@
using namespace std;

#include <windows.h>
#include <Gdiplus.h>
#include <gdiplus.h>

#include "core.h"
#include "../../image/image-private.h"


Ladataan…
Peruuta
Tallenna