cimg build on windows fixes
This commit is contained in:
John Cupitt
parent
a7d4136145
commit
93c89b37a5
|
|
@ -1,3 +1,6 @@
|
|||
31/10/07 started 7.13.2
|
||||
- build cimg on windows fixes
|
||||
|
||||
28/9/07 started 7.13.1
|
||||
- vips2dj can print RGB images
|
||||
- oop, include <stdexcept> missing
|
||||
|
|
|
|||
43
configure.in
43
configure.in
|
|
@ -5,7 +5,7 @@ AM_CONFIG_HEADER(config.h)
|
|||
# user-visible library versioning
|
||||
IM_MAJOR_VERSION=7
|
||||
IM_MINOR_VERSION=13
|
||||
IM_MICRO_VERSION=1
|
||||
IM_MICRO_VERSION=2
|
||||
IM_VERSION=$IM_MAJOR_VERSION.$IM_MINOR_VERSION.$IM_MICRO_VERSION
|
||||
IM_VERSION_STRING=$IM_VERSION-`date`
|
||||
|
||||
|
|
@ -21,9 +21,9 @@ PACKAGE=vips
|
|||
# interface changes backwards compatible?: increment age
|
||||
# interface changes not backwards compatible?: reset age to 0
|
||||
|
||||
LIBRARY_CURRENT=16
|
||||
LIBRARY_CURRENT=17
|
||||
LIBRARY_REVISION=0
|
||||
LIBRARY_AGE=1
|
||||
LIBRARY_AGE=2
|
||||
|
||||
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
|
||||
|
||||
|
|
@ -59,6 +59,13 @@ if test x"$vips_os_win32" = "xyes"; then
|
|||
VIPS_CFLAGS="-mms-bitfields $VIPS_CFLAGS"
|
||||
fi
|
||||
|
||||
# CImg needs flags changed on win32
|
||||
if test x"$vips_os_win32" = "xyes"; then
|
||||
AM_CONDITIONAL(OS_WIN32, true)
|
||||
else
|
||||
AM_CONDITIONAL(OS_WIN32, false)
|
||||
fi
|
||||
|
||||
# Cygwin/mingw need binary open to avoid CR/LF madness
|
||||
# ... should be a better way to test for this
|
||||
AC_MSG_CHECKING([for binary open needed])
|
||||
|
|
@ -151,7 +158,7 @@ PACKAGES_USED="$PACKAGES_USED glib-2.0 gmodule-2.0 libxml-2.0 gobject-2.0"
|
|||
# option to eval without threads
|
||||
AC_ARG_ENABLE(threads, AS_HELP_STRING([--enable-threads], [evaluate with threads (default: yes)]))
|
||||
|
||||
if test "x$enable_threads" != "xno"; then
|
||||
if test x"$enable_threads" != "xno"; then
|
||||
AC_DEFINE(HAVE_THREADS,1,[threaded evaluation])
|
||||
PKG_CHECK_MODULES(GTHREAD, gthread-2.0)
|
||||
PACKAGES_USED="$PACKAGES_USED gthread-2.0"
|
||||
|
|
@ -163,7 +170,7 @@ fi
|
|||
# that with pkg-config
|
||||
AC_ARG_WITH([fftw3], AS_HELP_STRING([--without-fftw3], [build without fftw3 (default: test)]))
|
||||
|
||||
if test "x$with_fftw3" != "xno"; then
|
||||
if test x"$with_fftw3" != "xno"; then
|
||||
PKG_CHECK_MODULES(FFTW3, fftw3,
|
||||
[AC_DEFINE(HAVE_FFTW3,1,[define if you have fftw3 installed.])
|
||||
PACKAGES_USED="$PACKAGES_USED fftw3"],
|
||||
|
|
@ -173,14 +180,14 @@ fi
|
|||
# ImageMagick ... detect attribute iteration too
|
||||
AC_ARG_WITH([magick], AS_HELP_STRING([--without-magick], [build without libMagic (default: test)]))
|
||||
|
||||
if test "x$with_magick" != "xno"; then
|
||||
if test x"$with_magick" != "xno"; then
|
||||
PKG_CHECK_MODULES(MAGICK, ImageMagick,
|
||||
[AC_DEFINE(HAVE_MAGICK,1,[define if you have libMagick installed.])
|
||||
PACKAGES_USED="$PACKAGES_USED ImageMagick"],
|
||||
[AC_MSG_WARN([libMagick not found; disabling Magick support])])
|
||||
fi
|
||||
|
||||
if test "x$with_magick" != "xno"; then
|
||||
if test x"$with_magick" != "xno"; then
|
||||
# we need ResetImageAttributeIterator() / GetNextImageAttribute() to get
|
||||
# attrs, but that's 6.2+ I think ... test for them
|
||||
save_LIBS=$LIBS
|
||||
|
|
@ -194,7 +201,7 @@ fi
|
|||
AC_ARG_WITH([liboil], AS_HELP_STRING([--without-liboil], [build without liboil
|
||||
(default: test)]))
|
||||
|
||||
if test "x$with_liboil" != "xno"; then
|
||||
if test x"$with_liboil" != "xno"; then
|
||||
PKG_CHECK_MODULES(LIBOIL, liboil-0.3,
|
||||
[AC_DEFINE(HAVE_LIBOIL,1,[define if you have liboil-0.3 installed.])
|
||||
PACKAGES_USED="$PACKAGES_USED liboil-0.3"],
|
||||
|
|
@ -204,7 +211,7 @@ fi
|
|||
# lcms
|
||||
AC_ARG_WITH([lcms], AS_HELP_STRING([--without-lcms], [build without lcms (default: test)]))
|
||||
|
||||
if test "x$with_lcms" != "xno"; then
|
||||
if test x"$with_lcms" != "xno"; then
|
||||
PKG_CHECK_MODULES(LCMS, lcms,
|
||||
[AC_DEFINE(HAVE_LCMS,1,[define if you have lcms installed.])
|
||||
PACKAGES_USED="$PACKAGES_USED lcms"],
|
||||
|
|
@ -215,7 +222,7 @@ fi
|
|||
AC_ARG_WITH([OpenEXR], AS_HELP_STRING([--without-OpenEXR], [build without OpenEXR (default: test)]))
|
||||
|
||||
# require 1.2.2 since 1.2.1 has a broken ImfCloseTiledInputFile()
|
||||
if test "x$with_OpenEXR" != "xno"; then
|
||||
if test x"$with_OpenEXR" != "xno"; then
|
||||
PKG_CHECK_MODULES(OPENEXR, OpenEXR >= 1.2.2,
|
||||
[AC_DEFINE(HAVE_OPENEXR,1,[define if you have OpenEXR >=1.2.2 installed.])
|
||||
PACKAGES_USED="$PACKAGES_USED OpenEXR"],
|
||||
|
|
@ -225,7 +232,7 @@ fi
|
|||
# pangoft2
|
||||
AC_ARG_WITH([pangoft2], AS_HELP_STRING([--without-pangoft2], [build without pangoft2 (default: test)]))
|
||||
|
||||
if test "x$with_pangoft2" != "xno"; then
|
||||
if test x"$with_pangoft2" != "xno"; then
|
||||
PKG_CHECK_MODULES(PANGOFT2, pangoft2,
|
||||
[AC_DEFINE(HAVE_PANGOFT2,1,[define if you have pangoft2 installed.])
|
||||
PACKAGES_USED="$PACKAGES_USED pangoft2"],
|
||||
|
|
@ -246,7 +253,7 @@ PKG_CHECK_MODULES(PNG, libpng,
|
|||
# libexif
|
||||
AC_ARG_WITH([libexif], AS_HELP_STRING([--without-libexif], [build without libexif (default: test)]))
|
||||
|
||||
if test "x$with_libexif" != "xno"; then
|
||||
if test x"$with_libexif" != "xno"; then
|
||||
PKG_CHECK_MODULES(EXIF, libexif >= 0.6,
|
||||
[AC_DEFINE(HAVE_EXIF,1,[define if you have libexif >= 0.6 installed.])
|
||||
PACKAGES_USED="$PACKAGES_USED libexif"],
|
||||
|
|
@ -256,7 +263,7 @@ fi
|
|||
|
||||
# some libexif packages need include <libexif/poop.h>, some just <poop.h>
|
||||
# how annoying
|
||||
if test "x$with_libexif" != "xno"; then
|
||||
if test x"$with_libexif" != "xno"; then
|
||||
# cppflags not cflags because we want the preproc to see the -I as well
|
||||
save_CPPFLAGS=$CPPFLAGS
|
||||
CPPFLAGS="$EXIF_CFLAGS $CPPFLAGS"
|
||||
|
|
@ -274,23 +281,23 @@ AC_CHECK_HEADER(linux/videodev.h,
|
|||
# make python binding?
|
||||
AC_ARG_WITH([python], AS_HELP_STRING([--without-python], [build without Python bindings (default: test)]))
|
||||
|
||||
if test "x$with_python" != "xno"; then
|
||||
if test x"$with_python" != "xno"; then
|
||||
AM_PATH_PYTHON(2.2,,
|
||||
[with_python=no
|
||||
AC_MSG_WARN([Python not found; disabling Python binding])])
|
||||
fi
|
||||
|
||||
if test "x$with_python" != "xno"; then
|
||||
if test x"$with_python" != "xno"; then
|
||||
AM_CHECK_PYTHON_HEADERS(,
|
||||
[with_python=no
|
||||
AC_MSG_WARN([Python headers not found])])
|
||||
fi
|
||||
|
||||
# need SWIG too
|
||||
if test "x$with_python" != "xno"; then
|
||||
if test x"$with_python" != "xno"; then
|
||||
AC_CHECK_PROG(HAVE_SWIG, swig, [yes])
|
||||
|
||||
if test "x$HAVE_SWIG" != "xyes"; then
|
||||
if test x"$HAVE_SWIG" != "xyes"; then
|
||||
with_python=no
|
||||
AC_MSG_WARN([SWIG not found; disabling Python binding])
|
||||
else
|
||||
|
|
@ -298,7 +305,7 @@ if test "x$with_python" != "xno"; then
|
|||
fi
|
||||
fi
|
||||
|
||||
if test "x$with_python" = "xyes"; then
|
||||
if test x"$with_python" = "xyes"; then
|
||||
AM_CONDITIONAL(HAVE_PYTHON, true)
|
||||
else
|
||||
AM_CONDITIONAL(HAVE_PYTHON, false)
|
||||
|
|
|
|||
|
|
@ -6,10 +6,19 @@ libcimg_la_SOURCES = \
|
|||
cimg.cpp
|
||||
|
||||
# various cimg settings as well
|
||||
# we need to change these a bit for win32
|
||||
if OS_WIN32
|
||||
AM_CPPFLAGS = \
|
||||
-Dcimg_strict \
|
||||
-Dcimg_OS=0 \
|
||||
-Dcimg_display_type=0 \
|
||||
-DLOCALEDIR=\""$(LOCALEDIR)"\"
|
||||
else
|
||||
AM_CPPFLAGS = \
|
||||
-Dcimg_strict \
|
||||
-Dcimg_OS=1 \
|
||||
-Dcimg_display_type=0 \
|
||||
-DLOCALEDIR=\""$(LOCALEDIR)"\"
|
||||
endif
|
||||
|
||||
INCLUDES = -I${top_srcdir}/include @VIPS_CFLAGS@ @VIPS_INCLUDES@
|
||||
|
|
|
|||
Loading…
Reference in New Issue