forked from enlightenment/efl
web: Include webkit header in Elementary.h when built with ewebkit or ewebkit2
Like other options, Elementary.h will contain WebKit.h or WebKit2.h when elementary was built with ewebkit or ewebkit2.
This commit is contained in:
parent
a50d31125d
commit
495f6755b0
|
@ -554,6 +554,7 @@ fi
|
||||||
AC_SUBST(ELM_EMAP_DEF)
|
AC_SUBST(ELM_EMAP_DEF)
|
||||||
|
|
||||||
ELM_WEB_DEF="#undef"
|
ELM_WEB_DEF="#undef"
|
||||||
|
ELM_WEB2_DEF="#undef"
|
||||||
|
|
||||||
elementary_web_backend="detect"
|
elementary_web_backend="detect"
|
||||||
elementary_web="no"
|
elementary_web="no"
|
||||||
|
@ -588,10 +589,12 @@ if test "x$want_elementary_web" != "xnone"; then
|
||||||
"WebKit's data dir")
|
"WebKit's data dir")
|
||||||
if test "x$elementary_web_backend" = "xewebkit2"; then
|
if test "x$elementary_web_backend" = "xewebkit2"; then
|
||||||
AC_DEFINE(USE_WEBKIT2, 1, [Use ewebkit2 as Elementary web backend])
|
AC_DEFINE(USE_WEBKIT2, 1, [Use ewebkit2 as Elementary web backend])
|
||||||
|
ELM_WEB2_DEF="#define"
|
||||||
|
else
|
||||||
|
ELM_WEB_DEF="#define"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
elementary_web=$want_elementary_web
|
elementary_web=$want_elementary_web
|
||||||
ELM_WEB_DEF="#define"
|
|
||||||
requirement_elm="${want_elementary_web} ${requirement_elm}"
|
requirement_elm="${want_elementary_web} ${requirement_elm}"
|
||||||
],
|
],
|
||||||
[elementary_web="no"]
|
[elementary_web="no"]
|
||||||
|
@ -606,6 +609,7 @@ if test "x$elementary_web_backend" = "xewebkit" -o "x$elementary_web_backend" =
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
AC_SUBST(ELM_WEB_DEF)
|
AC_SUBST(ELM_WEB_DEF)
|
||||||
|
AC_SUBST(ELM_WEB2_DEF)
|
||||||
|
|
||||||
ELM_DEBUG_DEF="#undef"
|
ELM_DEBUG_DEF="#undef"
|
||||||
want_elementary_debug="no"
|
want_elementary_debug="no"
|
||||||
|
|
|
@ -19,6 +19,7 @@ AM_CPPFLAGS = \
|
||||||
@ELEMENTARY_WINCE_CFLAGS@ \
|
@ELEMENTARY_WINCE_CFLAGS@ \
|
||||||
@ELEMENTARY_ELOCATION_CFLAGS@ \
|
@ELEMENTARY_ELOCATION_CFLAGS@ \
|
||||||
@ELEMENTARY_EWEATHER_CFLAGS@ \
|
@ELEMENTARY_EWEATHER_CFLAGS@ \
|
||||||
|
@ELEMENTARY_WEB_CFLAGS@ \
|
||||||
@ELEMENTARY_EMAP_CFLAGS@
|
@ELEMENTARY_EMAP_CFLAGS@
|
||||||
|
|
||||||
noinst_DATA = widget_preview_prefs.epb
|
noinst_DATA = widget_preview_prefs.epb
|
||||||
|
|
|
@ -16,6 +16,7 @@ AM_CPPFLAGS = \
|
||||||
@ELEMENTARY_WINCE_CFLAGS@ \
|
@ELEMENTARY_WINCE_CFLAGS@ \
|
||||||
@ELEMENTARY_ELOCATION_CFLAGS@ \
|
@ELEMENTARY_ELOCATION_CFLAGS@ \
|
||||||
@ELEMENTARY_EMAP_CFLAGS@ \
|
@ELEMENTARY_EMAP_CFLAGS@ \
|
||||||
|
@ELEMENTARY_WEB_CFLAGS@ \
|
||||||
@ELEMENTARY_WAYLAND_CFLAGS@ \
|
@ELEMENTARY_WAYLAND_CFLAGS@ \
|
||||||
@EVIL_CFLAGS@
|
@EVIL_CFLAGS@
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,7 @@
|
||||||
@ELM_WINCE_DEF@ ELM_WINCE
|
@ELM_WINCE_DEF@ ELM_WINCE
|
||||||
@ELM_ELOCATION_DEF@ ELM_ELOCATION
|
@ELM_ELOCATION_DEF@ ELM_ELOCATION
|
||||||
@ELM_WEB_DEF@ ELM_WEB
|
@ELM_WEB_DEF@ ELM_WEB
|
||||||
|
@ELM_WEB2_DEF@ ELM_WEB2
|
||||||
@ELM_EMAP_DEF@ ELM_EMAP
|
@ELM_EMAP_DEF@ ELM_EMAP
|
||||||
@ELM_DEBUG_DEF@ ELM_DEBUG
|
@ELM_DEBUG_DEF@ ELM_DEBUG
|
||||||
@ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H
|
@ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H
|
||||||
|
@ -92,6 +93,14 @@
|
||||||
#include <EMap.h>
|
#include <EMap.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef ELM_WEB
|
||||||
|
#include <EWebKit.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef ELM_WEB2
|
||||||
|
#include <EWebKit2.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifdef EAPI
|
#ifdef EAPI
|
||||||
# undef EAPI
|
# undef EAPI
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -22,7 +22,6 @@ EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP;
|
||||||
#define MY_CLASS_NAME_LEGACY "elm_web"
|
#define MY_CLASS_NAME_LEGACY "elm_web"
|
||||||
|
|
||||||
#ifdef HAVE_ELEMENTARY_WEB
|
#ifdef HAVE_ELEMENTARY_WEB
|
||||||
#include <EWebKit.h>
|
|
||||||
|
|
||||||
/* Similar to iPhone */
|
/* Similar to iPhone */
|
||||||
// TODO: switch between iPhone, iPad or Chrome/Safari based on some
|
// TODO: switch between iPhone, iPad or Chrome/Safari based on some
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
#include "elm_widget_web.h"
|
#include "elm_widget_web.h"
|
||||||
|
|
||||||
#if defined(HAVE_ELEMENTARY_WEB) && defined(USE_WEBKIT2)
|
#if defined(HAVE_ELEMENTARY_WEB) && defined(USE_WEBKIT2)
|
||||||
#include <EWebKit2.h>
|
|
||||||
|
|
||||||
EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP;
|
EAPI Eo_Op ELM_OBJ_WEB_BASE_ID = EO_NOOP;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue