hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

evas: use new bs static lib

This commit is contained in:
Marcel Hollerbach 2018-02-12 20:52:28 +01:00
parent c3f466c9ea
commit 09fd1c273c
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile_Evas.am
View File

@ -325,7 +325,9 @@ lib_evas_file_SOURCES = \
lib/evas/file/evas_module.c \ lib/evas/file/evas_module.c \
lib/evas/file/evas_module.h \ lib/evas/file/evas_module.h \
lib/evas/file/evas_path.c \ lib/evas/file/evas_path.c \
lib/evas/file/evas_path.h lib/evas/file/evas_path.h \
static_libs/buildsystem/buildsystem.h \
static_libs/buildsystem/buildsystem_autotools.c
lib_evas_libevas_la_SOURCES += \ lib_evas_libevas_la_SOURCES += \
$(lib_evas_file_SOURCES) $(lib_evas_file_SOURCES)
@ -498,6 +500,7 @@ lib_evas_libevas_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ -DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
@EVAS_CFLAGS@ \ @EVAS_CFLAGS@ \
@VALGRIND_CFLAGS@ \ @VALGRIND_CFLAGS@ \
@NEON_CFLAGS@ \ @NEON_CFLAGS@ \
@ -1546,6 +1549,7 @@ bin_evas_evas_cserve2_slave_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/evas\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ -DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
-DEVAS_MODULE_NO_ENGINES=1 \ -DEVAS_MODULE_NO_ENGINES=1 \
-DEVAS_MODULE_NO_IMAGE_SAVERS=1 \ -DEVAS_MODULE_NO_IMAGE_SAVERS=1 \
-DEVAS_MODULE_NO_VG_LOADERS=1 \ -DEVAS_MODULE_NO_VG_LOADERS=1 \

12
src/lib/evas/file/evas_module.c
View File

@ -6,6 +6,7 @@
#include "evas_common_private.h" #include "evas_common_private.h"
#include "evas_private.h" #include "evas_private.h"
#include "../../static_libs/buildsystem/buildsystem.h"
#ifndef EVAS_MODULE_NO_ENGINES #ifndef EVAS_MODULE_NO_ENGINES
@ -436,8 +437,7 @@ evas_module_engine_list(void)
{ {
if (run_in_tree) if (run_in_tree)
{ {
snprintf(buf, sizeof(buf), "%s/engines/%s/.libs", bs_mod_dir_get(buf, sizeof(buf), "evas/engines", fname);
s, fname);
if (!evas_file_path_exists(buf)) if (!evas_file_path_exists(buf))
buf[0] = '\0'; buf[0] = '\0';
} }
@ -566,8 +566,10 @@ evas_module_find_type(Evas_Module_Type type, const char *name)
{ {
if (run_in_tree) if (run_in_tree)
{ {
snprintf(buffer, sizeof(buffer), "%s/%s/%s/.libs/%s", char subsystem[PATH_MAX];
path, type_str, name, EVAS_MODULE_NAME);
snprintf(subsystem, sizeof(subsystem), "evas/%s", type_str);
bs_mod_get(buffer, sizeof(buffer), subsystem, name);
if (!evas_file_path_exists(buffer)) if (!evas_file_path_exists(buffer))
buffer[0] = '\0'; buffer[0] = '\0';
} }
@ -643,7 +645,7 @@ evas_module_unload(Evas_Module *em)
if (!em->definition) if (!em->definition)
return; return;
// for now lets not unload modules - they may still be in use. // for now lets not unload modules - they may still be in use.
// em->definition->func.close(em); // em->definition->func.close(em);
// em->loaded = 0; // em->loaded = 0;