summaryrefslogtreecommitdiff
path: root/src/bin/embryo
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-04 02:08:14 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-04 02:08:14 +0000
commit9ea2ce1041549c90f94062ce5ec145056e7fbdfa (patch)
tree3bcd3fb016bc498a72ff99c8d67c8b7ef2d91718 /src/bin/embryo
parente2ce20e9a4dfd12bb383a1b60032f2ef7b507850 (diff)
efl: merge edje.
this is still in progress, mostly the multisense stuff is pending. it seems that when we merge ecore_audio in edje the libremix and similar are gone, at least from Edje, and will be in ecore_audio itself (or pulseaudio). Changes: * __UNUSED__ to EINA_UNUSED * binaries (epp, embryo_cc, edje_cc) now consider EFL_RUN_IN_TREE and will assume the binaries are still not installed, running from build tree location (needs more testing, maybe doesn't work with srcdir != builddir, still doesn't solve cross compile builds) SVN revision: 82139
Diffstat (limited to 'src/bin/embryo')
-rw-r--r--src/bin/embryo/embryo_cc_sc1.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/src/bin/embryo/embryo_cc_sc1.c b/src/bin/embryo/embryo_cc_sc1.c
index 760bd3c1f6..f396f4f6e0 100644
--- a/src/bin/embryo/embryo_cc_sc1.c
+++ b/src/bin/embryo/embryo_cc_sc1.c
@@ -33,6 +33,7 @@
33#include <stdio.h> 33#include <stdio.h>
34#include <stdlib.h> 34#include <stdlib.h>
35#include <string.h> 35#include <string.h>
36#include <sys/stat.h>
36 37
37#ifdef HAVE_UNISTD_H 38#ifdef HAVE_UNISTD_H
38# include <unistd.h> 39# include <unistd.h>
@@ -581,8 +582,19 @@ parseoptions(int argc, char **argv, char *iname, char *oname,
581 int i, stack_size; 582 int i, stack_size;
582 size_t len; 583 size_t len;
583 584
585 str[0] = '\0';
586 if (getenv("EFL_RUN_IN_TREE"))
587 {
588 struct stat st;
589 snprintf(str, sizeof(str), "%s/data/embryo/", PACKAGE_BUILD_DIR);
590 if (stat(str, &st) != 0)
591 str[0] = '\0';
592 }
593
594 if (str[0] == '\0')
595 snprintf(str, sizeof(str), "%s/include/", e_prefix_data_get());
596
584 /* use embryo include dir always */ 597 /* use embryo include dir always */
585 snprintf(str, sizeof(str), "%s/include/", e_prefix_data_get());
586 insert_path(str); 598 insert_path(str);
587 insert_path("./"); 599 insert_path("./");
588 600