Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/edje
Dir : e17/libs/edje/src/bin
Modified Files:
edje_cc_sources.c edje_decc.c
Log Message:
edje_decc works properly with default theme (as long as u rememeber to pass
-DE17_PROFILE=SLOW_PC" so #defines get fixed
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_cc_sources.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- edje_cc_sources.c 4 Jun 2005 09:17:14 -0000 1.14
+++ edje_cc_sources.c 23 May 2006 03:23:31 -0000 1.15
@@ -90,7 +90,7 @@
int got_hash = 0;
int forgetit = 0;
int haveinclude = 0;
- char *file = NULL;
+ char *file = NULL, *fname = NULL;
while ((!forgetit) && (*p))
{
@@ -171,6 +171,9 @@
else
snprintf(file, l, "%s/%s", dir, p + 1);
+ fname = strdup(p + 1);
+ pp = strrchr(fname, end);
+ if (pp) *pp = 0;
forgetit = 1;
}
}
@@ -183,10 +186,11 @@
got_hash = 0;
}
- if (file)
+ if ((file) && (fname))
{
- source_fetch_file(file, file);
+ source_fetch_file(file, fname);
free(file);
+ free(fname);
}
}
free (dir);
===================================================================
RCS file: /cvs/e/e17/libs/edje/src/bin/edje_decc.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- edje_decc.c 13 Feb 2006 18:20:26 -0000 1.17
+++ edje_decc.c 23 May 2006 03:23:31 -0000 1.18
@@ -283,7 +283,7 @@
}
f = fopen(out, "w");
fprintf(f, "#!/bin/sh\n");
- fprintf(f, "%s $@ --image_dir . --font_dir . %s -o %s.edj\n",
edje_file->compiler, sf->name, outdir);
+ fprintf(f, "%s $@ -id . -fd . %s -o %s.edj\n", edje_file->compiler,
sf->name, outdir);
fclose(f);
#ifndef WIN32
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
