forked from enlightenment/efl
parent
cc7b3822d4
commit
42a26cb3db
|
@ -100,21 +100,6 @@ dnl Set PACKAGE_SOURCE_DIR in config.h.
|
||||||
packagesrcdir=`cd $srcdir && pwd`
|
packagesrcdir=`cd $srcdir && pwd`
|
||||||
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
|
AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source code directory])
|
||||||
|
|
||||||
AC_MSG_CHECKING(whether to build only fb support)
|
|
||||||
have_fb_only="no"
|
|
||||||
AC_ARG_ENABLE(fb-only, [ --enable-fb-only enable building of fb support only ], [
|
|
||||||
if [ test "$enableval" = "yes" ]; then
|
|
||||||
AC_MSG_RESULT(yes)
|
|
||||||
have_fb_only="yes"
|
|
||||||
else
|
|
||||||
AC_MSG_RESULT(no)
|
|
||||||
have_fb_only="no"
|
|
||||||
fi
|
|
||||||
], [
|
|
||||||
AC_MSG_RESULT($have_fb_only)
|
|
||||||
]
|
|
||||||
)
|
|
||||||
|
|
||||||
AC_MSG_CHECKING(whether to build edje_cc)
|
AC_MSG_CHECKING(whether to build edje_cc)
|
||||||
have_edje_cc="yes"
|
have_edje_cc="yes"
|
||||||
AC_ARG_ENABLE(edje-cc, [ --disable-edje-cc disable building of edje_cc ], [
|
AC_ARG_ENABLE(edje-cc, [ --disable-edje-cc disable building of edje_cc ], [
|
||||||
|
@ -130,12 +115,6 @@ AC_ARG_ENABLE(edje-cc, [ --disable-edje-cc disable building of edje_cc ],
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
edje_def=""
|
|
||||||
if test "x$have_fb_only" = "xyes"; then
|
|
||||||
edje_def="-DEDJE_FB_ONLY"
|
|
||||||
fi
|
|
||||||
AC_SUBST(edje_def)
|
|
||||||
|
|
||||||
AC_ARG_WITH(eet,
|
AC_ARG_WITH(eet,
|
||||||
[ --with-eet=DIR use eet in <DIR>],
|
[ --with-eet=DIR use eet in <DIR>],
|
||||||
[CFLAGS="$CFLAGS -I$withval/include"
|
[CFLAGS="$CFLAGS -I$withval/include"
|
||||||
|
@ -186,6 +165,9 @@ AC_ARG_WITH(ecore,
|
||||||
AC_PATH_GENERIC(ecore, , ,
|
AC_PATH_GENERIC(ecore, , ,
|
||||||
AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
|
AC_MSG_ERROR(Cannot find ecore: Is ecore-config in path?))
|
||||||
|
|
||||||
|
AC_CHECK_HEADERS(Ecore_X.h)
|
||||||
|
AC_CHECK_HEADERS(Ecore_Fb.h)
|
||||||
|
|
||||||
AC_MSG_CHECKING([for location of Vim data files])
|
AC_MSG_CHECKING([for location of Vim data files])
|
||||||
install_vim="yes";
|
install_vim="yes";
|
||||||
AC_ARG_WITH(vim,
|
AC_ARG_WITH(vim,
|
||||||
|
|
|
@ -29,8 +29,6 @@ edje_main.h
|
||||||
edje_LDADD = \
|
edje_LDADD = \
|
||||||
$(top_builddir)/src/lib/libedje.la
|
$(top_builddir)/src/lib/libedje.la
|
||||||
|
|
||||||
edje_CPPFLAGS = @edje_def@
|
|
||||||
|
|
||||||
edje_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
edje_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
||||||
|
|
||||||
|
|
||||||
|
@ -47,8 +45,6 @@ edje_cc_LDADD = \
|
||||||
$(top_builddir)/src/lib/libedje.la \
|
$(top_builddir)/src/lib/libedje.la \
|
||||||
@IMLIB2_LIBS@
|
@IMLIB2_LIBS@
|
||||||
|
|
||||||
edje_cc_CPPFLAGS = @edje_def@
|
|
||||||
|
|
||||||
edje_cc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
edje_cc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
||||||
|
|
||||||
|
|
||||||
|
@ -62,8 +58,6 @@ edje_decc_LDADD = \
|
||||||
$(top_builddir)/src/lib/libedje.la \
|
$(top_builddir)/src/lib/libedje.la \
|
||||||
@IMLIB2_LIBS@
|
@IMLIB2_LIBS@
|
||||||
|
|
||||||
edje_decc_CPPFLAGS = @edje_def@
|
|
||||||
|
|
||||||
edje_decc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
edje_decc_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
||||||
|
|
||||||
|
|
||||||
|
@ -74,8 +68,6 @@ edje_ls.c
|
||||||
edje_ls_LDADD = \
|
edje_ls_LDADD = \
|
||||||
$(top_builddir)/src/lib/libedje.la
|
$(top_builddir)/src/lib/libedje.la
|
||||||
|
|
||||||
edje_ls_CPPFLAGS = @edje_def@
|
|
||||||
|
|
||||||
edje_ls_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
edje_ls_DEPENDENCIES = $(top_builddir)/src/lib/libedje.la
|
||||||
|
|
||||||
EXTRA_SCRIPTS = edje_recc
|
EXTRA_SCRIPTS = edje_recc
|
||||||
|
|
|
@ -74,7 +74,7 @@ main_start(int argc, char **argv)
|
||||||
ecore_app_args_set(argc, (const char **)argv);
|
ecore_app_args_set(argc, (const char **)argv);
|
||||||
ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, NULL);
|
ecore_event_handler_add(ECORE_EVENT_SIGNAL_EXIT, main_signal_exit, NULL);
|
||||||
if (!ecore_evas_init()) return -1;
|
if (!ecore_evas_init()) return -1;
|
||||||
#ifndef EDJE_FB_ONLY
|
#ifdef HAVE_ECORE_X_H
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
|
|
||||||
|
|
|
@ -1,18 +1,22 @@
|
||||||
#ifndef EDJE_H
|
#ifndef EDJE_H
|
||||||
#define EDJE_H
|
#define EDJE_H
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <Evas.h>
|
#include <Evas.h>
|
||||||
#include <Ecore.h>
|
#include <Ecore.h>
|
||||||
#ifndef EDJE_FB_ONLY
|
#ifdef HAVE_ECORE_X_H
|
||||||
#include <Ecore_X.h>
|
#include <Ecore_X.h>
|
||||||
#else
|
#endif
|
||||||
|
#ifdef HAVE_ECORE_FB_H
|
||||||
#include <Ecore_Fb.h>
|
#include <Ecore_Fb.h>
|
||||||
#endif
|
#endif
|
||||||
#include <Ecore_Evas.h>
|
#include <Ecore_Evas.h>
|
||||||
#include <Eet.h>
|
#include <Eet.h>
|
||||||
#include "Edje.h"
|
#include "Edje.h"
|
||||||
#include "edje_private.h"
|
#include "edje_private.h"
|
||||||
#include "config.h"
|
|
||||||
|
|
||||||
#define DAT PACKAGE_DATA_DIR"/"
|
#define DAT PACKAGE_DATA_DIR"/"
|
||||||
|
|
||||||
|
|
|
@ -12,8 +12,7 @@ INCLUDES = \
|
||||||
@EET_CFLAGS@ \
|
@EET_CFLAGS@ \
|
||||||
@EMBRYO_CFLAGS@ \
|
@EMBRYO_CFLAGS@ \
|
||||||
@EVAS_CFLAGS@ \
|
@EVAS_CFLAGS@ \
|
||||||
@ECORE_CFLAGS@ \
|
@ECORE_CFLAGS@
|
||||||
@edje_def@
|
|
||||||
|
|
||||||
lib_LTLIBRARIES = \
|
lib_LTLIBRARIES = \
|
||||||
libedje.la
|
libedje.la
|
||||||
|
|
|
@ -45,7 +45,7 @@ _edje_mouse_down_cb(void *data, Evas * e, Evas_Object * obj, void *event_info)
|
||||||
ed = data;
|
ed = data;
|
||||||
rp = evas_object_data_get(obj, "real_part");
|
rp = evas_object_data_get(obj, "real_part");
|
||||||
if (!rp) return;
|
if (!rp) return;
|
||||||
#ifndef EDJE_FB_ONLY
|
#ifdef HAVE_ECORE_X_H
|
||||||
if (ecore_event_current_type_get() == ECORE_X_EVENT_MOUSE_BUTTON_DOWN)
|
if (ecore_event_current_type_get() == ECORE_X_EVENT_MOUSE_BUTTON_DOWN)
|
||||||
{
|
{
|
||||||
Ecore_X_Event_Mouse_Button_Down *evx;
|
Ecore_X_Event_Mouse_Button_Down *evx;
|
||||||
|
|
|
@ -1,14 +1,14 @@
|
||||||
#ifndef _EDJE_PRIVATE_H
|
#ifndef _EDJE_PRIVATE_H
|
||||||
#define _EDJE_PRIVATE_H
|
#define _EDJE_PRIVATE_H
|
||||||
|
|
||||||
#include "config.h"
|
#ifdef HAVE_CONFIG_H
|
||||||
|
#include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include <Evas.h>
|
#include <Evas.h>
|
||||||
#include <Ecore.h>
|
#include <Ecore.h>
|
||||||
#ifndef EDJE_FB_ONLY
|
#ifdef HAVE_ECORE_X_H
|
||||||
#include <Ecore_X.h>
|
#include <Ecore_X.h>
|
||||||
#else
|
|
||||||
#include <Ecore_Fb.h>
|
|
||||||
#endif
|
#endif
|
||||||
#include <Eet.h>
|
#include <Eet.h>
|
||||||
#include <Embryo.h>
|
#include <Embryo.h>
|
||||||
|
|
Loading…
Reference in New Issue