forked from enlightenment/efl
Fix compilation and warnings on Windows:
* include Evil.h for getenv on mingw32ce * include config.h in benchmark.c so that EAPI is correctly defined * minor fixes in configure.ac SVN revision: 36729
This commit is contained in:
parent
e917baaacd
commit
84dcc24d09
|
@ -140,7 +140,7 @@ PKG_PROG_PKG_CONFIG
|
|||
# Evil library for compilation on Windows CE
|
||||
|
||||
case "$host_os" in
|
||||
mingw32ce* | cegcc*)
|
||||
mingw* | cegcc*)
|
||||
PKG_CHECK_MODULES([EVIL], [evil])
|
||||
AC_DEFINE(HAVE_EVIL, 1, [Set to 1 if evil package is installed])
|
||||
;;
|
||||
|
@ -266,16 +266,16 @@ AC_SUBST(EINA_CFLAGS)
|
|||
|
||||
|
||||
### Checks for linker characteristics
|
||||
EINA_LIBS=""
|
||||
EINA_LIBS="${EFL_COVERAGE_LIBS}"
|
||||
lt_enable_auto_import=""
|
||||
case "${host_os}" in
|
||||
mingw* | cegcc*)
|
||||
AC_DEFINE(EFL_EINA_BUILD, 1, [Define to mention that eina is built])
|
||||
EINA_LIBS="${COVERAGE_LIBS} ${EVIL_LIBS} -lm"
|
||||
EINA_LIBS="${EINA_LIBS} ${EVIL_LIBS} -lm"
|
||||
lt_enable_auto_import="-Wl,--enable-auto-import"
|
||||
;;
|
||||
*)
|
||||
EINA_LIBS="${EFL_COVERAGE_LIBS} -ldl -lrt -lm"
|
||||
EINA_LIBS="${EINA_LIBS} -ldl -lrt -lm"
|
||||
;;
|
||||
esac
|
||||
AC_SUBST(EINA_LIBS)
|
||||
|
|
|
@ -24,6 +24,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <limits.h>
|
||||
|
|
|
@ -354,6 +354,10 @@
|
|||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#ifdef HAVE_EVIL
|
||||
# include <Evil.h>
|
||||
#endif
|
||||
|
||||
#include "eina_error.h"
|
||||
#include "eina_inlist.h"
|
||||
#include "eina_private.h"
|
||||
|
|
|
@ -64,6 +64,10 @@
|
|||
# include "config.h"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_EVIL
|
||||
# include <Evil.h>
|
||||
#endif
|
||||
|
||||
#include "eina_error.h"
|
||||
#include "eina_list.h"
|
||||
#include "eina_mempool.h"
|
||||
|
|
|
@ -23,6 +23,10 @@
|
|||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef HAVE_EVIL
|
||||
# include <Evil.h>
|
||||
#endif
|
||||
|
||||
#define EINA_MAGIC_DEBUG
|
||||
#include "eina_magic.h"
|
||||
|
||||
|
|
|
@ -67,6 +67,10 @@
|
|||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
#ifdef HAVE_EVIL
|
||||
# include <Evil.h>
|
||||
#endif
|
||||
|
||||
#include "eina_stringshare.h"
|
||||
#include "eina_hash.h"
|
||||
#include "eina_rbtree.h"
|
||||
|
|
Loading…
Reference in New Issue