Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_parse.c
Log Message:
finx dir of input file, strip off file to find dir component and -I that when
running cpp..
===================================================================
RCS file: /cvsroot/enlightenment/e17/libs/edje/src/bin/edje_cc_parse.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -3 -r1.33 -r1.34
--- edje_cc_parse.c 22 Dec 2004 14:41:12 -0000 1.33
+++ edje_cc_parse.c 10 Jan 2005 05:51:14 -0000 1.34
@@ -603,11 +603,16 @@
{
int fd;
off_t size;
- char *data;
+ char *data, *p;
char buf[4096];
+ char inc[4096];
static char tmpn[4096];
strcpy(tmpn, "/tmp/edje_cc.edc-tmp-XXXXXX");
+ strncpy(inc, file_in, 4000); inc[4001] = 0;
+ p = strrchr(inc, '/');
+ if (!p) strcpy(inc, "./");
+ else *p = 0;
fd = mkstemp(tmpn);
if (fd >= 0)
{
@@ -637,11 +642,11 @@
strcat(def, " ");
}
}
- snprintf(buf, sizeof(buf), "cat %s | /usr/bin/cpp %s -E -o %s",
file_in, def, tmpn);
+ snprintf(buf, sizeof(buf), "cat %s | /usr/bin/cpp -I%s %s -E -o %s",
inc, file_in, def, tmpn);
ret = system(buf);
if (ret < 0)
{
- snprintf(buf, sizeof(buf), "/usr/bin/gcc %s -E -o %s %s", def,
tmpn, file_in);
+ snprintf(buf, sizeof(buf), "/usr/bin/gcc -I%s %s -E -o %s %s",
inc, def, tmpn, file_in);
ret = system(buf);
}
if (ret >= 0) file_in = tmpn;
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
