forked from enlightenment/efl
fix library compilation on Windows (it should be cleaned, though)
There is still a problem with the binary, because of ecore_getopt SVN revision: 43402
This commit is contained in:
parent
199400bc7d
commit
a0dc963b1a
|
@ -18,6 +18,7 @@ AC_C___ATTRIBUTE__
|
||||||
dnl AC_C_CONST is bogus, its tests fails on -Wall -O1 ( uninitialized values)
|
dnl AC_C_CONST is bogus, its tests fails on -Wall -O1 ( uninitialized values)
|
||||||
dnl AC_C_CONST
|
dnl AC_C_CONST
|
||||||
|
|
||||||
|
AC_LIBTOOL_WIN32_DLL
|
||||||
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
|
define([AC_LIBTOOL_LANG_F77_CONFIG], [:])dnl
|
||||||
AC_PROG_LIBTOOL
|
AC_PROG_LIBTOOL
|
||||||
|
|
||||||
|
@ -58,6 +59,17 @@ AC_ARG_WITH(internal-maximum-log-level,
|
||||||
fi
|
fi
|
||||||
], [:])
|
], [:])
|
||||||
|
|
||||||
|
EFL_ETHUMB_BUILD=""
|
||||||
|
lt_enable_auto_import=""
|
||||||
|
case "$host_os" in
|
||||||
|
mingw* | cegcc*)
|
||||||
|
EFL_ETHUMB_BUILD="-DEFL_ETHUMB_BUILD"
|
||||||
|
lt_enable_auto_import="-Wl,--enable-auto-import"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
AC_SUBST(EFL_ETHUMB_BUILD)
|
||||||
|
AC_SUBST(lt_enable_auto_import)
|
||||||
|
|
||||||
PKG_CHECK_MODULES(EINA, [eina-0])
|
PKG_CHECK_MODULES(EINA, [eina-0])
|
||||||
PKG_CHECK_MODULES(EVAS, [evas])
|
PKG_CHECK_MODULES(EVAS, [evas])
|
||||||
PKG_CHECK_MODULES(ECORE, [ecore])
|
PKG_CHECK_MODULES(ECORE, [ecore])
|
||||||
|
|
|
@ -24,14 +24,16 @@
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
#include <Ethumb.h>
|
|
||||||
#include <Eina.h>
|
#include <Eina.h>
|
||||||
#include <Ecore_Getopt.h>
|
|
||||||
#include <Ecore.h>
|
#include <Ecore.h>
|
||||||
|
#include <Ecore_Getopt.h>
|
||||||
|
#include <Ethumb.h>
|
||||||
|
|
||||||
const char *aspect_opt[] = { "keep", "ignore", "crop", NULL };
|
const char *aspect_opt[] = { "keep", "ignore", "crop", NULL };
|
||||||
const char *format_opt[] = { "png", "jpg", "eet", NULL };
|
const char *format_opt[] = { "png", "jpg", "eet", NULL };
|
||||||
|
|
|
@ -23,11 +23,24 @@
|
||||||
#ifdef HAVE_CONFIG_H
|
#ifdef HAVE_CONFIG_H
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
#endif
|
#endif
|
||||||
#include <Eina.h>
|
|
||||||
#include <eina_safety_checks.h>
|
#ifdef HAVE_ALLOCA_H
|
||||||
#include "Ethumb.h"
|
# include <alloca.h>
|
||||||
#include "ethumb_private.h"
|
#elif defined __GNUC__
|
||||||
#include "Ethumb_Plugin.h"
|
# 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
|
||||||
|
extern "C"
|
||||||
|
# endif
|
||||||
|
void *alloca (size_t);
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <limits.h>
|
#include <limits.h>
|
||||||
|
@ -38,18 +51,24 @@
|
||||||
#include <sys/stat.h>
|
#include <sys/stat.h>
|
||||||
#include <dirent.h>
|
#include <dirent.h>
|
||||||
#include <dlfcn.h>
|
#include <dlfcn.h>
|
||||||
#include "md5.h"
|
|
||||||
|
|
||||||
#ifndef PATH_MAX
|
#ifndef PATH_MAX
|
||||||
#define PATH_MAX 4096
|
# define PATH_MAX 4096
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <Ecore.h>
|
#include <Eina.h>
|
||||||
|
#include <eina_safety_checks.h>
|
||||||
#include <Evas.h>
|
#include <Evas.h>
|
||||||
|
#include <Ecore.h>
|
||||||
#include <Ecore_Evas.h>
|
#include <Ecore_Evas.h>
|
||||||
#include <Ecore_File.h>
|
#include <Ecore_File.h>
|
||||||
#include <Edje.h>
|
#include <Edje.h>
|
||||||
|
|
||||||
|
#include "Ethumb.h"
|
||||||
|
#include "ethumb_private.h"
|
||||||
|
#include "Ethumb_Plugin.h"
|
||||||
|
#include "md5.h"
|
||||||
|
|
||||||
static int _log_dom = -1;
|
static int _log_dom = -1;
|
||||||
#define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__)
|
#define DBG(...) EINA_LOG_DOM_DBG(_log_dom, __VA_ARGS__)
|
||||||
#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)
|
#define INF(...) EINA_LOG_DOM_INFO(_log_dom, __VA_ARGS__)
|
||||||
|
|
|
@ -1,9 +1,18 @@
|
||||||
#ifndef __ETHUMB_H__
|
#ifndef __ETHUMB_H__
|
||||||
#define __ETHUMB_H__ 1
|
#define __ETHUMB_H__ 1
|
||||||
|
|
||||||
|
#include <Eina.h>
|
||||||
|
#include <Evas.h>
|
||||||
|
#include <Ecore.h>
|
||||||
|
#include <Ecore_Evas.h>
|
||||||
|
|
||||||
|
#ifdef EAPI
|
||||||
|
# undef EAPI
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef EAPI
|
#ifndef EAPI
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
# ifdef EFL_EVAS_BUILD
|
# ifdef EFL_ETHUMB_BUILD
|
||||||
# ifdef DLL_EXPORT
|
# ifdef DLL_EXPORT
|
||||||
# define EAPI __declspec(dllexport)
|
# define EAPI __declspec(dllexport)
|
||||||
# define GNUC_NULL_TERMINATED
|
# define GNUC_NULL_TERMINATED
|
||||||
|
@ -31,11 +40,6 @@
|
||||||
#endif /* ! _WIN32 */
|
#endif /* ! _WIN32 */
|
||||||
#endif /* EAPI */
|
#endif /* EAPI */
|
||||||
|
|
||||||
#include <Ecore.h>
|
|
||||||
#include <Ecore_Evas.h>
|
|
||||||
#include <Evas.h>
|
|
||||||
#include <Eina.h>
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -5,7 +5,8 @@ SUBDIRS = .
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir) \
|
-I$(top_srcdir) \
|
||||||
-I$(top_builddir) \
|
-I$(top_builddir) \
|
||||||
@EVAS_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@
|
@EVAS_CFLAGS@ @ECORE_EVAS_CFLAGS@ @ECORE_FILE_CFLAGS@ @EDJE_CFLAGS@ \
|
||||||
|
@EFL_ETHUMB_BUILD@
|
||||||
|
|
||||||
include_HEADERS = Ethumb.h Ethumb_Plugin.h
|
include_HEADERS = Ethumb.h Ethumb_Plugin.h
|
||||||
noinst_HEADERS = md5.h ethumb_private.h
|
noinst_HEADERS = md5.h ethumb_private.h
|
||||||
|
@ -19,7 +20,7 @@ libethumb_la_SOURCES = \
|
||||||
libethumb_la_DEPENDENCIES = $(top_builddir)/config.h
|
libethumb_la_DEPENDENCIES = $(top_builddir)/config.h
|
||||||
libethumb_la_LIBADD = \
|
libethumb_la_LIBADD = \
|
||||||
@EVAS_LIBS@ @ECORE_EVAS_LIBS@ @ECORE_FILE_LIBS@ @EDJE_LIBS@
|
@EVAS_LIBS@ @ECORE_EVAS_LIBS@ @ECORE_FILE_LIBS@ @EDJE_LIBS@
|
||||||
libethumb_la_LDFLAGS = -version-info @version_info@
|
libethumb_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@
|
||||||
|
|
||||||
|
|
||||||
if USE_MODULE_ETHUMBD
|
if USE_MODULE_ETHUMBD
|
||||||
|
|
Loading…
Reference in New Issue