forked from enlightenment/efl
elementary: use new bs static lib
This commit is contained in:
parent
014df3d710
commit
86b4af41c3
|
@ -791,6 +791,8 @@ lib_elementary_libelementary_la_SOURCES = \
|
|||
lib/elementary/efl_selection_manager_private.h \
|
||||
lib/elementary/efl_selection.c \
|
||||
lib/elementary/efl_ui_dnd.c \
|
||||
static_libs/buildsystem/buildsystem.h \
|
||||
static_libs/buildsystem/buildsystem_autotools.c \
|
||||
$(NULL)
|
||||
|
||||
|
||||
|
@ -814,6 +816,8 @@ lib_elementary_libelementary_la_CPPFLAGS = \
|
|||
-DPACKAGE_DATA_DIR=\"$(datadir)/elementary\" \
|
||||
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
|
||||
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
|
||||
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
|
||||
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
|
||||
-DLOCALE_DIR=\"$(localedir)\" \
|
||||
-DICON_DIR=\"$(datadir)/icons\" \
|
||||
-DELM_TOP_BUILD_DIR=\"$(top_builddir)\" \
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
#endif
|
||||
|
||||
#include <Elementary.h>
|
||||
|
||||
#include "../../static_libs/buildsystem/buildsystem.h"
|
||||
#include "elm_priv.h"
|
||||
|
||||
/* what are moodules in elementary for? for modularising behavior and features
|
||||
|
@ -135,8 +135,7 @@ _elm_module_load(Elm_Module *m)
|
|||
#ifdef NEED_RUN_IN_TREE
|
||||
if (getenv("EFL_RUN_IN_TREE"))
|
||||
{
|
||||
snprintf(buf, sizeof(buf),
|
||||
ELM_TOP_BUILD_DIR "/src/modules/elementary/%s/.libs/module"EFL_SHARED_EXTENSION, m->name);
|
||||
bs_mod_get(buf, sizeof(buf), "elementary", m->name);
|
||||
}
|
||||
else
|
||||
#endif
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
#include <Elementary.h>
|
||||
|
||||
#include "../../static_libs/buildsystem/buildsystem.h"
|
||||
#include "elm_priv.h"
|
||||
#include "elm_widget_web.h"
|
||||
|
||||
|
@ -197,16 +198,10 @@ _elm_web_init(const char *engine)
|
|||
{
|
||||
char buf[PATH_MAX];
|
||||
|
||||
#ifdef NEED_RUN_IN_TREE
|
||||
if (getenv("EFL_RUN_IN_TREE"))
|
||||
snprintf(buf, sizeof(buf),
|
||||
ELM_TOP_BUILD_DIR"/src/modules/web/%s/.libs/module"EFL_SHARED_EXTENSION,
|
||||
engine);
|
||||
else
|
||||
#endif
|
||||
snprintf(buf, sizeof(buf),
|
||||
"%s/elementary/modules/web/%s/%s/module"EFL_SHARED_EXTENSION,
|
||||
_elm_lib_dir, engine, MODULE_ARCH);
|
||||
if (!bs_mod_get(buf, sizeof(buf), "elementary/web", engine))
|
||||
snprintf(buf, sizeof(buf),
|
||||
"%s/elementary/modules/web/%s/%s/module"EFL_SHARED_EXTENSION,
|
||||
_elm_lib_dir, engine, MODULE_ARCH);
|
||||
|
||||
if (ewm.m)
|
||||
{
|
||||
|
|
Loading…
Reference in New Issue