forked from enlightenment/efl
ethumb: fix compilation on windows.
Patch by Vincent Torri. SVN revision: 81783
This commit is contained in:
parent
f9ebc7bdcd
commit
fa1e49a642
|
@ -13,3 +13,8 @@
|
|||
2012-08-30 Carsten Haitzler (The Rasterman)
|
||||
|
||||
1.7.0 release
|
||||
|
||||
2012-12-28 Vincent Torri
|
||||
|
||||
* Fix compilation on Windows when there is no .la files
|
||||
* Minor autotools cleanup
|
||||
|
|
|
@ -25,7 +25,6 @@ AC_CONFIG_SRCDIR([configure.ac])
|
|||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AC_CANONICAL_BUILD
|
||||
AC_CANONICAL_HOST
|
||||
AC_ISC_POSIX
|
||||
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AH_TOP([
|
||||
|
@ -61,12 +60,8 @@ dnl we just have set the version info, then:
|
|||
AC_SUBST(version_info)
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_CC_STDC
|
||||
AM_PROG_CC_C_O
|
||||
AC_HEADER_STDC
|
||||
AC_C___ATTRIBUTE__
|
||||
dnl AC_C_CONST is bogus, its tests fails on -Wall -O1 ( uninitialized values)
|
||||
dnl AC_C_CONST
|
||||
|
||||
AC_LIBTOOL_WIN32_DLL
|
||||
define([AC_LIBTOOL_LANG_CXX_CONFIG], [:])
|
||||
|
@ -101,19 +96,13 @@ AC_ARG_WITH(internal-maximum-log-level,
|
|||
fi
|
||||
], [:])
|
||||
|
||||
EFL_ETHUMB_BUILD=""
|
||||
EFL_ETHUMB_CLIENT_BUILD=""
|
||||
lt_enable_auto_import=""
|
||||
case "$host_os" in
|
||||
mingw* | cegcc*)
|
||||
EFL_ETHUMB_BUILD="-DEFL_ETHUMB_BUILD"
|
||||
EFL_ETHUMB_CLIENT_BUILD="-DEFL_ETHUMB_CLIENT_BUILD"
|
||||
lt_enable_auto_import="-Wl,--enable-auto-import"
|
||||
mingw*)
|
||||
PKG_CHECK_MODULES([EVIL], [evil >= 1.6.99])
|
||||
AC_DEFINE([HAVE_EVIL], [1], [Set to 1 if Evil package is installed])
|
||||
requirement_ethumb="${requirement_ethumb} evil >= 1.6.99"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(EFL_ETHUMB_BUILD)
|
||||
AC_SUBST(EFL_ETHUMB_CLIENT_BUILD)
|
||||
AC_SUBST(lt_enable_auto_import)
|
||||
|
||||
PKG_CHECK_MODULES(EINA, [eina >= 1.6.99])
|
||||
PKG_CHECK_MODULES(EVAS, [evas >= 1.6.99])
|
||||
|
@ -124,8 +113,8 @@ PKG_CHECK_MODULES(EDJE, [edje >= 1.6.99])
|
|||
PKG_CHECK_MODULES(EET, [eet >= 1.6.99])
|
||||
EFL_WITH_BIN([edje], [edje-cc], [edje_cc])
|
||||
|
||||
requirement_ethumb="eina >= 1.6.99 evas >= 1.6.99 ecore >= 1.6.99 ecore-evas >= 1.6.99 ecore-file >= 1.6.99 edje >= 1.6.99"
|
||||
requirement_ethumb_client=""
|
||||
requirement_ethumb=" ${requirement_ethumb} eina >= 1.6.99 evas >= 1.6.99 ecore >= 1.6.99 ecore-evas >= 1.6.99 ecore-file >= 1.6.99 edje >= 1.6.99"
|
||||
requirement_ethumb_client="eina >= 1.6.99 ecore >= 1.6.99 edbus >= 1.6.99 ethumb >= 1.6.99"
|
||||
|
||||
AM_CONDITIONAL(HAVE_EMOTION, false)
|
||||
define([CHECK_MODULE_EMOTION],
|
||||
|
|
|
@ -8,9 +8,9 @@ endif
|
|||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_builddir) \
|
||||
-DPLUGINSDIR=\"$(libdir)/ethumb/plugins\" \
|
||||
@EFL_ETHUMB_BUILD@ \
|
||||
-DPLUGINSDIR=\"$(pkglibdir)/plugins\" \
|
||||
-DEFL_ETHUMB_BUILD \
|
||||
@EVIL_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@EVAS_CFLAGS@ \
|
||||
@ECORE_CFLAGS@ \
|
||||
|
@ -37,10 +37,11 @@ libethumb_la_LIBADD = \
|
|||
@ECORE_EVAS_LIBS@ \
|
||||
@ECORE_LIBS@ \
|
||||
@EVAS_LIBS@ \
|
||||
@EINA_LIBS@
|
||||
@EINA_LIBS@ \
|
||||
@EVIL_LIBS@
|
||||
|
||||
if HAVE_LIBEXIF
|
||||
libethumb_la_LIBADD += @LIBEXIF_LIBS@
|
||||
endif
|
||||
|
||||
libethumb_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
|
||||
libethumb_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
|
||||
|
|
|
@ -2,9 +2,8 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
|
||||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir) \
|
||||
-I$(top_builddir) \
|
||||
-I$(top_srcdir)/src/lib \
|
||||
@EFL_ETHUMB_CLIENT_BUILD@ \
|
||||
-DEFL_ETHUMB_CLIENT_BUILD \
|
||||
@ECORE_CFLAGS@ \
|
||||
@EDBUS_CFLAGS@ \
|
||||
@EINA_CFLAGS@
|
||||
|
@ -20,4 +19,4 @@ $(top_builddir)/src/lib/libethumb.la \
|
|||
@ECORE_LIBS@ \
|
||||
@EDBUS_LIBS@ \
|
||||
@EINA_LIBS@
|
||||
libethumb_client_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
|
||||
libethumb_client_la_LDFLAGS = -no-undefined -version-info @version_info@
|
||||
|
|
|
@ -23,21 +23,30 @@
|
|||
#include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef STDC_HEADERS
|
||||
# include <stdlib.h>
|
||||
# include <stddef.h>
|
||||
#else
|
||||
# ifdef HAVE_STDLIB_H
|
||||
# include <stdlib.h>
|
||||
# endif
|
||||
#endif
|
||||
#ifdef HAVE_ALLOCA_H
|
||||
# include <alloca.h>
|
||||
#elif defined __GNUC__
|
||||
# define alloca __builtin_alloca
|
||||
#elif defined _AIX
|
||||
# define alloca __alloca
|
||||
#elif defined _MSC_VER
|
||||
# include <malloc.h>
|
||||
# define alloca _alloca
|
||||
#else
|
||||
# include <stddef.h>
|
||||
# ifdef __cplusplus
|
||||
#elif !defined alloca
|
||||
# ifdef __GNUC__
|
||||
# define alloca __builtin_alloca
|
||||
# elif defined _AIX
|
||||
# define alloca __alloca
|
||||
# elif defined _MSC_VER
|
||||
# include <malloc.h>
|
||||
# define alloca _alloca
|
||||
# elif !defined HAVE_ALLOCA
|
||||
# ifdef __cplusplus
|
||||
extern "C"
|
||||
# endif
|
||||
# endif
|
||||
void *alloca (size_t);
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
|
@ -60,6 +69,14 @@ void *alloca (size_t);
|
|||
# define PATH_MAX 4096
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_LIBEXIF
|
||||
#include <libexif/exif-data.h>
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_EVIL
|
||||
# include <Evil.h>
|
||||
#endif
|
||||
|
||||
#include <Eina.h>
|
||||
#include <eina_safety_checks.h>
|
||||
#include <Evas.h>
|
||||
|
@ -73,10 +90,6 @@ void *alloca (size_t);
|
|||
#include "Ethumb_Plugin.h"
|
||||
#include "md5.h"
|
||||
|
||||
#ifdef HAVE_LIBEXIF
|
||||
#include <libexif/exif-data.h>
|
||||
#endif
|
||||
|
||||
static Ethumb_Version _version = { VMAJ, VMIN, VMIC, VREV };
|
||||
EAPI Ethumb_Version *ethumb_version = &_version;
|
||||
|
||||
|
|
|
@ -14,9 +14,9 @@ AM_CPPFLAGS = \
|
|||
-I$(top_srcdir)/src/lib \
|
||||
-I$(top_srcdir)/src/plugins/emotion \
|
||||
-DPLUGINSDIR=\"$(pluginsdir)\" \
|
||||
-DEFL_ETHUMB_BUILD \
|
||||
@ECORE_EVAS_CFLAGS@ \
|
||||
@EET_CFLAGS@ \
|
||||
@EFL_ETHUMB_BUILD@ \
|
||||
@EVAS_CFLAGS@ \
|
||||
@EINA_CFLAGS@ \
|
||||
@EMOTION_CFLAGS@ \
|
||||
|
|
|
@ -3,7 +3,7 @@ MAINTAINERCLEANFILES = Makefile.in
|
|||
AM_CPPFLAGS = \
|
||||
-I$(top_srcdir)/src/lib \
|
||||
-I$(top_srcdir)/src/plugins/epdf \
|
||||
@EFL_ETHUMB_BUILD@ \
|
||||
-DEFL_ETHUMB_BUILD \
|
||||
@EINA_CFLAGS@ \
|
||||
@EVAS_CFLAGS@ \
|
||||
@EPDF_CFLAGS@
|
||||
|
|
Loading…
Reference in New Issue