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

embryo:use new bs static lib

This commit is contained in:
Marcel Hollerbach 2018-02-16 20:35:38 +01:00
parent 86b4af41c3
commit 64d6718734
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile_Embryo.am
View File

@ -44,12 +44,15 @@ bin/embryo/embryo_cc_scexpand.c \
bin/embryo/embryo_cc_sclist.c \
bin/embryo/embryo_cc_scvars.c \
bin/embryo/embryo_cc_prefix.c \
bin/embryo/embryo_cc_prefix.h
bin/embryo/embryo_cc_prefix.h \
static_libs/buildsystem/buildsystem.h \
static_libs/buildsystem/buildsystem_autotools.c
bin_embryo_embryo_cc_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/embryo\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
@EMBRYO_CFLAGS@

15
src/bin/embryo/embryo_cc_sc1.c
View File

@ -44,6 +44,8 @@
#include "embryo_cc_sc.h"
#include "embryo_cc_prefix.h"
#include "../../static_libs/buildsystem/buildsystem.h"
#define VERSION_STR "2.4"
#define VERSION_INT 240
@ -568,22 +570,13 @@ static void
parseoptions(int argc, char **argv, char *iname, char *oname,
char *pname EINA_UNUSED, char *rname EINA_UNUSED)
{
char str[PATH_MAX];
char str[PATH_MAX] = "";
int i, stack_size;
size_t len;
#ifdef NEED_RUN_IN_TREE
str[0] = '\0';
if (getenv("EFL_RUN_IN_TREE"))
{
struct stat st;
snprintf(str, sizeof(str), "%s/data/embryo", PACKAGE_SRC_DIR);
if (stat(str, &st) != 0)
str[0] = '\0';
}
bs_data_path_get(str, sizeof(str), "embryo", "");
if (str[0] == '\0')
#endif
snprintf(str, sizeof(str), "%s/include/", e_prefix_data_get());
/* use embryo include dir always */