Changeset 3074 for libpipi


Ignore:
Timestamp:
Oct 23, 2008, 2:30:18 PM (11 years ago)
Author:
Sam Hocevar
Message:

libpipi: the GDI+ codec can now compile using mingw32, unfortunately it
does not link yet due to a bug in mingw's ld.

Location:
libpipi/trunk
Files:
6 edited
2 moved

Legend:

Unmodified
Added
Removed
  • libpipi/trunk/build-win32

    r3064 r3074  
    2222cd "${BUILDDIR}"
    2323# Build for win32
    24 "${SRCDIR}/configure" --host=i586-mingw32msvc --prefix=/ --bindir=/bin --libdir=/lib "$@"
     24"${SRCDIR}/configure" --host=i586-mingw32msvc --prefix=/ --bindir=/bin --libdir=/lib CPPFLAGS="-I${SRCDIR}/win32/gdiplus/include" LIBS="-L${SRCDIR}/win32/gdiplus/lib" "$@"
    2525make pkglibdir=/lib pkgdatadir=/data bindir=/bin
    2626# Install into our private directory
  • libpipi/trunk/configure.ac

    r3071 r3074  
    2121AM_PROG_CC_C_O
    2222AC_PROG_CPP
     23AC_PROG_CXX
     24AC_PROG_CXXCPP
    2325AC_PROG_OBJC
    2426_AM_DEPENDENCIES([OBJC])
     
    149151fi
    150152AM_CONDITIONAL(USE_GDI, test "${ac_cv_my_have_gdi}" = "yes")
    151 AM_CONDITIONAL(USE_GDIPLUS, test "${ac_cv_my_have_gdi}" = "yes")
     153
     154# Use Windows GDI+?
     155ac_cv_my_have_gdiplus="no"
     156AC_LANG_PUSH(C++)
     157AC_CHECK_HEADERS(Gdiplus.h,
     158 [ac_cv_my_have_gdiplus="yes"],
     159 [ac_cv_my_have_gdiplus="no"],
     160 [#include <windows.h>])
     161AC_LANG_POP(C++)
     162if test "${ac_cv_my_have_gdiplus}" != "no"; then
     163  AC_DEFINE(USE_GDIPLUS, 1, Define to 1 to use GDI+)
     164fi
     165AM_CONDITIONAL(USE_GDIPLUS, test "${ac_cv_my_have_gdiplus}" = "yes")
    152166
    153167# Use Cocoa?
  • libpipi/trunk/pipi/codec/gdiplus.cpp

    r3073 r3074  
    2727#include <Gdiplus.h>
    2828
     29extern "C" {
    2930#include "pipi.h"
    3031#include "pipi_internals.h"
     32}
    3133
    3234extern "C" pipi_image_t *pipi_load_gdiplus(const char *name)
    3335{
     36#if 0
    3437    size_t len;
    3538    len = mbstowcs(NULL, name, 0);
     
    7679
    7780    return img;
     81#endif
     82return NULL;
    7883}
    7984
    8085extern "C" int pipi_save_gdiplus(pipi_image_t *img, const char *name)
    8186{
     87#if 0
    8288    wchar_t const *fmt;
    8389    if(strstr(name, ".gif"))
     
    149155    delete b;
    150156
     157#endif
    151158    return 0;
    152159}
  • libpipi/trunk/pipi/pipi_internals.h

    r2902 r3074  
    8383#endif
    8484
     85#ifdef USE_GDIPLUS
     86pipi_image_t *pipi_load_gdiplus(const char *name);
     87int pipi_save_gdiplus(pipi_image_t *img, const char *name);
     88#endif
     89
    8590#ifdef USE_GDI
    8691pipi_image_t *pipi_load_gdi(const char *name);
  • libpipi/trunk/win32/gdiplus/include/GdiplusEnums.h

    r3072 r3074  
    531531inline BOOL
    532532ObjectTypeIsValid(
    533     ObjectType      type
     533    enum ObjectType      type
    534534    )
    535535{
  • libpipi/trunk/win32/gdiplus/include/GdiplusFlat.h

    r3072 r3074  
    3333VOID
    3434WINGDIPAPI
    35 GdipDisplayPaletteWindowNotify(WindowNotifyEnum notify);
     35GdipDisplayPaletteWindowNotify(enum WindowNotifyEnum notify);
    3636
    3737#endif
Note: See TracChangeset for help on using the changeset viewer.