summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--src/bin/edje/edje_cc_parse.c20
2 files changed, 18 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 99658c5d26..9166cb356e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-08-29 Boris Faure
2
3 * Edje: export EINA_VERSION_MAJOR/MINOR when compiling edc files
4
12013-08-29 Cedric Bail 52013-08-29 Cedric Bail
2 6
3 * Evas: add interceptor for focus_set. 7 * Evas: add interceptor for focus_set.
diff --git a/src/bin/edje/edje_cc_parse.c b/src/bin/edje/edje_cc_parse.c
index 6950655b0a..946149ab51 100644
--- a/src/bin/edje/edje_cc_parse.c
+++ b/src/bin/edje/edje_cc_parse.c
@@ -843,23 +843,31 @@ compile(void)
843 buf2[0] = '\0'; 843 buf2[0] = '\0';
844 if (getenv("EFL_RUN_IN_TREE")) 844 if (getenv("EFL_RUN_IN_TREE"))
845 { 845 {
846 snprintf(buf2, sizeof(buf2), "%s/src/bin/edje/epp/epp" EPP_EXT, 846 snprintf(buf2, sizeof(buf2),
847 "%s/src/bin/edje/epp/epp" EPP_EXT,
847 PACKAGE_BUILD_DIR); 848 PACKAGE_BUILD_DIR);
848 if (!ecore_file_exists(buf2)) 849 if (!ecore_file_exists(buf2))
849 buf2[0] = '\0'; 850 buf2[0] = '\0';
850 } 851 }
851 852
852 if (buf2[0] == '\0') 853 if (buf2[0] == '\0')
853 snprintf(buf2, sizeof(buf2), "%s/edje/utils/" MODULE_ARCH "/epp" EPP_EXT, 854 snprintf(buf2, sizeof(buf2),
855 "%s/edje/utils/" MODULE_ARCH "/epp" EPP_EXT,
854 eina_prefix_lib_get(pfx)); 856 eina_prefix_lib_get(pfx));
855 if (ecore_file_exists(buf2)) 857 if (ecore_file_exists(buf2))
856 { 858 {
857 if (anotate) 859 if (anotate)
858 snprintf(buf, sizeof(buf), "%s -anotate -a %s %s -I%s %s -o %s", 860 snprintf(buf, sizeof(buf), "%s -anotate -a %s %s -I%s %s -o %s"
859 buf2, watchfile ? watchfile : "/dev/null", file_in, inc, def, tmpn); 861 " -DEINA_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d",
862 buf2, watchfile ? watchfile : "/dev/null", file_in,
863 inc, def, tmpn,
864 EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
860 else 865 else
861 snprintf(buf, sizeof(buf), "%s -a %s %s -I%s %s -o %s", 866 snprintf(buf, sizeof(buf), "%s -a %s %s -I%s %s -o %s"
862 buf2, watchfile ? watchfile : "/dev/null", file_in, inc, def, tmpn); 867 " -DEINA_VERSION_MAJOR=%d -DEFL_VERSION_MINOR=%d",
868 buf2, watchfile ? watchfile : "/dev/null", file_in,
869 inc, def, tmpn,
870 EINA_VERSION_MAJOR, EINA_VERSION_MINOR);
863 ret = system(buf); 871 ret = system(buf);
864 } 872 }
865 else 873 else